diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-03 11:07:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-04 12:04:52 +0100 |
commit | b4e430a42e086091a08d60018ac694fa99c4b8c7 (patch) | |
tree | 27463ca785d457cc79075b22abb17549fbe848b7 /meta/classes-recipe | |
parent | 80d4ed954a49091ce3f79e195288ca4b13521bf2 (diff) | |
download | poky-b4e430a42e086091a08d60018ac694fa99c4b8c7.tar.gz |
autotools/libtool: Drop libtool sysroot patch as not needed
libtool auto detects the sysroot from gcc's parameters or configuration so we
don't need to pass in this configuration separately to libtool.
Whilst the option names do conflict with gcc/binutils, that is an issue for those
projects to resolve, not us. Upstream libtool did reject the patch. We can
drop this patch and simplify our code.
(From OE-Core rev: 7c8553f81bccc3e8c2bb1116ee1e89f5f8af4c9e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r-- | meta/classes-recipe/autotools.bbclass | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 7ee1b0d9c7..9ebdca4768 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass | |||
@@ -57,12 +57,6 @@ export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" | |||
57 | export LD_FOR_BUILD = "${BUILD_LD}" | 57 | export LD_FOR_BUILD = "${BUILD_LD}" |
58 | export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" | 58 | export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" |
59 | 59 | ||
60 | def append_libtool_sysroot(d): | ||
61 | # Only supply libtool sysroot option for non-native packages | ||
62 | if not bb.data.inherits_class('native', d): | ||
63 | return '--with-libtool-sysroot=${STAGING_DIR_HOST}' | ||
64 | return "" | ||
65 | |||
66 | CONFIGUREOPTS = " --build=${BUILD_SYS} \ | 60 | CONFIGUREOPTS = " --build=${BUILD_SYS} \ |
67 | --host=${HOST_SYS} \ | 61 | --host=${HOST_SYS} \ |
68 | --target=${TARGET_SYS} \ | 62 | --target=${TARGET_SYS} \ |
@@ -81,8 +75,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \ | |||
81 | --infodir=${infodir} \ | 75 | --infodir=${infodir} \ |
82 | --mandir=${mandir} \ | 76 | --mandir=${mandir} \ |
83 | --disable-silent-rules \ | 77 | --disable-silent-rules \ |
84 | ${CONFIGUREOPT_DEPTRACK} \ | 78 | ${CONFIGUREOPT_DEPTRACK}" |
85 | ${@append_libtool_sysroot(d)}" | ||
86 | CONFIGUREOPT_DEPTRACK ?= "--disable-dependency-tracking" | 79 | CONFIGUREOPT_DEPTRACK ?= "--disable-dependency-tracking" |
87 | 80 | ||
88 | CACHED_CONFIGUREVARS ?= "" | 81 | CACHED_CONFIGUREVARS ?= "" |