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 /meta-oe | |
| 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>
Diffstat (limited to 'meta-oe')
11 files changed, 2 insertions, 64 deletions
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 " |
