diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2025-02-24 07:27:33 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-02-23 17:36:08 -0800 |
commit | 8a29c46188b31851b32414d9d3dbb38b1b48a073 (patch) | |
tree | 9eafd21cb9c233d5d83b3053b9a371e5475a3b36 | |
parent | 7e576c04091dc232c4d456834157d448fb5272d9 (diff) | |
download | meta-openembedded-8a29c46188b31851b32414d9d3dbb38b1b48a073.tar.gz |
recipes: drop ld-is-gold support
The gold linker support has been dropped in oe-core[1]. Remove related
special cases and patches in recipes.
[1] https://git.openembedded.org/openembedded-core/commit/?id=a4addb9ab63011e7c604fc5daff95559e7d214e7
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 files changed, 3 insertions, 158 deletions
diff --git a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch b/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch deleted file mode 100644 index d47f692c0e..0000000000 --- a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | fuse: Fix linking issues with gold linker | ||
2 | |||
3 | fuse has problems when linking with gold since it uses version | ||
4 | scripts in a way thats so perticular to bfd ld | ||
5 | |||
6 | /home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstro | ||
7 | error: symbol __fuse_exited has undefined version | ||
8 | | collect2: ld returned 1 exit status | ||
9 | | make[1]: *** [libfuse.la] Error 1 | ||
10 | | make[1]: *** Waiting for unfinished jobs.... | ||
11 | |||
12 | For more details | ||
13 | |||
14 | http://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning | ||
15 | http://sources.redhat.com/bugzilla/show_bug.cgi?id=10861 | ||
16 | http://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524 | ||
17 | http://www.airs.com/blog/archives/300 | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
22 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
23 | --- | ||
24 | lib/fuse.c | 10 +++++----- | ||
25 | lib/fuse_mt.c | 2 +- | ||
26 | lib/fuse_versionscript | 3 +++ | ||
27 | lib/helper.c | 6 +++--- | ||
28 | 4 files changed, 12 insertions(+), 9 deletions(-) | ||
29 | |||
30 | diff --git a/lib/fuse.c b/lib/fuse.c | ||
31 | index 067d0dc..6d27711 100644 | ||
32 | --- a/lib/fuse.c | ||
33 | +++ b/lib/fuse.c | ||
34 | @@ -4873,11 +4873,11 @@ struct fuse *fuse_new_compat1(int fd, int flags, | ||
35 | 11); | ||
36 | } | ||
37 | |||
38 | -FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); | ||
39 | -FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); | ||
40 | -FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); | ||
41 | -FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); | ||
42 | -FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); | ||
43 | +FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); | ||
44 | +FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); | ||
45 | +FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); | ||
46 | +FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); | ||
47 | +FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); | ||
48 | FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); | ||
49 | |||
50 | #endif /* __FreeBSD__ || __NetBSD__ */ | ||
51 | diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c | ||
52 | index f6dbe71..fd5ac23 100644 | ||
53 | --- a/lib/fuse_mt.c | ||
54 | +++ b/lib/fuse_mt.c | ||
55 | @@ -119,4 +119,4 @@ int fuse_loop_mt(struct fuse *f) | ||
56 | return res; | ||
57 | } | ||
58 | |||
59 | -FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); | ||
60 | +FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); | ||
61 | diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript | ||
62 | index 8d91887..de16ab2 100644 | ||
63 | --- a/lib/fuse_versionscript | ||
64 | +++ b/lib/fuse_versionscript | ||
65 | @@ -1,3 +1,6 @@ | ||
66 | +FUSE_UNVERSIONED { | ||
67 | +}; | ||
68 | + | ||
69 | FUSE_2.2 { | ||
70 | global: | ||
71 | fuse_destroy; | ||
72 | diff --git a/lib/helper.c b/lib/helper.c | ||
73 | index b644012..c5349bf 100644 | ||
74 | --- a/lib/helper.c | ||
75 | +++ b/lib/helper.c | ||
76 | @@ -436,10 +436,10 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[]) | ||
77 | return fuse_mount_compat22(mountpoint, NULL); | ||
78 | } | ||
79 | |||
80 | -FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); | ||
81 | +FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); | ||
82 | FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); | ||
83 | -FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); | ||
84 | -FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); | ||
85 | +FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); | ||
86 | +FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); | ||
87 | FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); | ||
88 | |||
89 | #endif /* __FreeBSD__ || __NetBSD__ */ | ||
90 | -- | ||
91 | 1.8.1.2 | ||
92 | |||
diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index fca7d42b39..094ed8c8ad 100644 --- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb | |||
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
11 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | 11 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" |
12 | 12 | ||
13 | SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \ | 13 | SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \ |
14 | file://gold-unversioned-symbol.patch \ | ||
15 | file://aarch64.patch \ | 14 | file://aarch64.patch \ |
16 | file://0001-fuse-fix-the-return-value-of-help-option.patch \ | 15 | file://0001-fuse-fix-the-return-value-of-help-option.patch \ |
17 | file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \ | 16 | file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \ |
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb index beff73b1b3..05dca8d9c0 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb | |||
@@ -125,7 +125,7 @@ EXTRA_OECONF += "--enable-fhs \ | |||
125 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ | 125 | --pythondir=${PYTHON_SITEPACKAGES_DIR} \ |
126 | " | 126 | " |
127 | 127 | ||
128 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 128 | LDFLAGS += "-Wl,-z,relro,-z,now" |
129 | 129 | ||
130 | do_configure:append() { | 130 | do_configure:append() { |
131 | cd ${S}/pidl/ | 131 | cd ${S}/pidl/ |
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index ee5c77a85d..b4864defb7 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | |||
@@ -73,10 +73,6 @@ WIREDTIGER ?= "off" | |||
73 | WIREDTIGER:x86-64 = "on" | 73 | WIREDTIGER:x86-64 = "on" |
74 | WIREDTIGER:aarch64 = "on" | 74 | WIREDTIGER:aarch64 = "on" |
75 | 75 | ||
76 | # ld.gold: fatal error: build/59f4f0dd/mongo/mongod: Structure needs cleaning | ||
77 | LDFLAGS:append:x86:libc-musl = " -fuse-ld=bfd" | ||
78 | LDFLAGS:remove:toolchain-clang = "-fuse-ld=bfd" | ||
79 | |||
80 | EXTRA_OESCONS = "PREFIX=${prefix} \ | 76 | EXTRA_OESCONS = "PREFIX=${prefix} \ |
81 | DESTDIR=${D} \ | 77 | DESTDIR=${D} \ |
82 | MAXLINELENGTH='2097152' \ | 78 | MAXLINELENGTH='2097152' \ |
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb index d82e03e81f..afed3b4a81 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb | |||
@@ -50,15 +50,9 @@ LDFLAGS += "-B${S}" | |||
50 | 50 | ||
51 | inherit autotools-brokensep cpan-base | 51 | inherit autotools-brokensep cpan-base |
52 | 52 | ||
53 | #The CUSTOM_LDSCRIPTS doesn't work with the gold linker | ||
54 | do_configure:prepend() { | 53 | do_configure:prepend() { |
55 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then | ||
56 | sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile.in | ||
57 | fi | ||
58 | |||
59 | ln -sf ld.hugetlbfs ${S}/ld | 54 | ln -sf ld.hugetlbfs ${S}/ld |
60 | ln -sf ld.hugetlbfs ${S}/ld.bfd | 55 | ln -sf ld.hugetlbfs ${S}/ld.bfd |
61 | ln -sf ld.hugetlbfs ${S}/ld.gold | ||
62 | ln -sf ld.hugetlbfs ${S}/ld.lld | 56 | ln -sf ld.hugetlbfs ${S}/ld.lld |
63 | } | 57 | } |
64 | 58 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index b620355730..51eaf4a502 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -69,14 +69,8 @@ PACKAGECONFIG[krb5] = ", ,krb5" | |||
69 | PACKAGECONFIG[lz4] = ", ,lz4" | 69 | PACKAGECONFIG[lz4] = ", ,lz4" |
70 | PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl" | 70 | PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl" |
71 | 71 | ||
72 | # MariaDB doesn't link properly with gold | ||
73 | # https://mariadb.atlassian.net/browse/MDEV-5982 | ||
74 | TARGET_CFLAGS += "-fuse-ld=bfd" | ||
75 | LDFLAGS += " -pthread" | 72 | LDFLAGS += " -pthread" |
76 | 73 | ||
77 | BUILD_CFLAGS += "-fuse-ld=bfd" | ||
78 | BUILD_CXXFLAGS += "-fuse-ld=bfd" | ||
79 | |||
80 | LDFLAGS:x86:toolchain-clang = "-latomic" | 74 | LDFLAGS:x86:toolchain-clang = "-latomic" |
81 | LDFLAGS:riscv32:toolchain-clang = "-latomic" | 75 | LDFLAGS:riscv32:toolchain-clang = "-latomic" |
82 | 76 | ||
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 6b60d89187..bd3a8f2ff5 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb | |||
@@ -24,8 +24,6 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ | |||
24 | ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | 24 | ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ |
25 | " | 25 | " |
26 | 26 | ||
27 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||
28 | |||
29 | do_install:append() { | 27 | do_install:append() { |
30 | rm -rf ${D}${datadir} | 28 | rm -rf ${D}${datadir} |
31 | } | 29 | } |
diff --git a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch deleted file mode 100644 index 090ed5c1c9..0000000000 --- a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Wed, 21 Sep 2016 21:14:40 +0200 | ||
4 | Subject: [PATCH] detect gold as GNU linker too | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | |||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 468c718..cd93f30 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) | ||
22 | AC_MSG_CHECKING([for GNU ld]) | ||
23 | LD=$($CC -print-prog-name=ld 2>&5) | ||
24 | |||
25 | -if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then | ||
26 | +if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then | ||
27 | # Not | ||
28 | GNU_LD="" | ||
29 | AC_MSG_RESULT([no]) | ||
diff --git a/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb b/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb index 1e39a1c5ca..834dddd0b5 100644 --- a/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb +++ b/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb | |||
@@ -20,7 +20,6 @@ DEPENDS = "slang popt python3" | |||
20 | SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ | 20 | SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ |
21 | file://cross_ar.patch \ | 21 | file://cross_ar.patch \ |
22 | file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ | 22 | file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ |
23 | file://0001-detect-gold-as-GNU-linker-too.patch \ | ||
24 | " | 23 | " |
25 | 24 | ||
26 | SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb" | 25 | SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb" |
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb index 5437ea13e8..d8dda6d090 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb | |||
@@ -34,8 +34,6 @@ inherit systemd cmake pkgconfig python3native perlnative | |||
34 | SYSTEMD_SERVICE:${PN} = "openwsmand.service" | 34 | SYSTEMD_SERVICE:${PN} = "openwsmand.service" |
35 | SYSTEMD_AUTO_ENABLE = "disable" | 35 | SYSTEMD_AUTO_ENABLE = "disable" |
36 | 36 | ||
37 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" | ||
38 | |||
39 | EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ | 37 | EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ |
40 | -DBUILD_LIBCIM=NO \ | 38 | -DBUILD_LIBCIM=NO \ |
41 | -DBUILD_PERL=YES \ | 39 | -DBUILD_PERL=YES \ |
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 083cfcb810..622c5ce07c 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | |||
@@ -42,7 +42,6 @@ SYSTEMD_PACKAGES = "${PN}" | |||
42 | SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service" | 42 | SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service" |
43 | SYSTEMD_AUTO_ENABLE = "enable" | 43 | SYSTEMD_AUTO_ENABLE = "enable" |
44 | 44 | ||
45 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||
46 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--allow-shlib-undefined ', '', d)}" | 45 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--allow-shlib-undefined ', '', d)}" |
47 | 46 | ||
48 | EXTRA_OECONF = '--enable-debug \ | 47 | EXTRA_OECONF = '--enable-debug \ |
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 59796cc65f..df65478b40 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc | |||
@@ -34,9 +34,6 @@ LDFLAGS:append = " -lm" | |||
34 | 34 | ||
35 | CXXFLAGS:append:toolchain-clang = " -Wno-error=dtor-typedef" | 35 | CXXFLAGS:append:toolchain-clang = " -Wno-error=dtor-typedef" |
36 | 36 | ||
37 | # Workaround for linking issues seen with armv7a + gold | ||
38 | LDFLAGS:append:arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||
39 | |||
40 | BINCONFIG = "${bindir}/directfb-config" | 37 | BINCONFIG = "${bindir}/directfb-config" |
41 | 38 | ||
42 | inherit autotools binconfig-disabled pkgconfig | 39 | inherit autotools binconfig-disabled pkgconfig |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 1f608c29d0..9ff7662a51 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -58,7 +58,3 @@ EXTRA_OECONF = "--with-user= \ | |||
58 | --with-thin-repair=${sbindir}/thin_repair \ | 58 | --with-thin-repair=${sbindir}/thin_repair \ |
59 | --with-thin-restore=${sbindir}/thin_restore \ | 59 | --with-thin-restore=${sbindir}/thin_restore \ |
60 | " | 60 | " |
61 | |||
62 | # gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129 | ||
63 | # after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab | ||
64 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}" | ||
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index 52bf2eb399..07fa0d06f7 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | |||
@@ -135,12 +135,8 @@ EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES | |||
135 | EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | 135 | EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" |
136 | EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | 136 | EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" |
137 | 137 | ||
138 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " | 138 | # JIT does not work on RISCV |
139 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " | 139 | EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF" |
140 | |||
141 | # JIT and gold linker does not work on RISCV | ||
142 | EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | ||
143 | EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" | ||
144 | 140 | ||
145 | # JIT not supported on MIPS either | 141 | # JIT not supported on MIPS either |
146 | EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " | 142 | EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " |