helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-04-02 02:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

autotools/libtool: Drop libtool sysroot patch as not needed

Browse Source 
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>
This commit is contained in:
Richard Purdie 2024-06-03 11:07:40 +01:00
parent 80d4ed954a
commit b4e430a42e
6 changed files with 6 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-global/insane.bbclass
View File

@ -58,7 +58,7 @@ enabled tests are listed here, the do_package_qa task will run under fakeroot."
ALL_QA = "${WARN_QA} ${ERROR_QA}"
UNKNOWN_CONFIGURE_OPT_IGNORE ?= "--enable-nls --disable-nls --disable-silent-rules --disable-dependency-tracking --with-libtool-sysroot --disable-static"
UNKNOWN_CONFIGURE_OPT_IGNORE ?= "--enable-nls --disable-nls --disable-silent-rules --disable-dependency-tracking --disable-static"
# This is a list of directories that are expected to be empty.
QA_EMPTY_DIRS ?= " \

9
meta/classes-recipe/autotools.bbclass
View File

@ -57,12 +57,6 @@ export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
export LD_FOR_BUILD = "${BUILD_LD}"
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
def append_libtool_sysroot(d):
# Only supply libtool sysroot option for non-native packages
if not bb.data.inherits_class('native', d):
return '--with-libtool-sysroot=${STAGING_DIR_HOST}'
return ""
CONFIGUREOPTS = " --build=${BUILD_SYS} \
--host=${HOST_SYS} \
--target=${TARGET_SYS} \
@ -81,8 +75,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
--infodir=${infodir} \
--mandir=${mandir} \
--disable-silent-rules \
${CONFIGUREOPT_DEPTRACK} \
${@append_libtool_sysroot(d)}"
${CONFIGUREOPT_DEPTRACK}"
CONFIGUREOPT_DEPTRACK ?= "--disable-dependency-tracking"
CACHED_CONFIGUREVARS ?= ""

1
meta/recipes-devtools/libtool/libtool-2.5.0.inc
View File

@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \
file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \
file://0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch \
file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \
file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \

2
meta/recipes-devtools/libtool/libtool-native_2.5.0.bb
View File

@ -4,7 +4,7 @@ DEPENDS = ""
inherit native
EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
EXTRA_OECONF = " --with-sysroot=${STAGING_DIR_NATIVE}"
do_configure:prepend () {
# Remove any existing libtool m4 since old stale versions would break

171
meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch
View File

@ -1,171 +0,0 @@
From: Khem Raj <raj.khem@gmail.com>
Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils
This patch renames the --with-sysroot option to --with-libtool-sysroot
to avoid namespace conflict with binutils, gcc and other toolchain
components since these componets also add that option to configure
and this becomes confusing and conflicting otherwise.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream report:
http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html]
Index: libtool-2.5.0/m4/libtool.m4
===================================================================
--- libtool-2.5.0.orig/m4/libtool.m4
+++ libtool-2.5.0/m4/libtool.m4
@@ -1243,16 +1243,16 @@ _LT_DECL([], [ECHO], [1], [An echo progr
AC_DEFUN([_LT_WITH_SYSROOT],
[m4_require([_LT_DECL_SED])dnl
AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+AC_ARG_WITH([libtool-sysroot],
+[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@],
[Search for dependent libraries within DIR (or the compiler's sysroot
if not specified).])],
-[], [with_sysroot=no])
+[], [with_libtool_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case $with_sysroot in #(
+case $with_libtool_sysroot in #(
yes)
if test yes = "$GCC"; then
# Trim trailing / since we'll always append absolute paths and we want
@@ -1261,12 +1261,12 @@ case $with_sysroot in #(
fi
;; #(
/*)
- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"`
;; #(
no|'')
;; #(
*)
- AC_MSG_RESULT([$with_sysroot])
+ AC_MSG_RESULT([$with_libtool_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
Index: libtool-2.5.0/tests/sysroot.at
===================================================================
--- libtool-2.5.0.orig/tests/sysroot.at
+++ libtool-2.5.0/tests/sysroot.at
@@ -65,7 +65,7 @@ while read file; do
done])
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
#???
if test PATH = "$shlibpath_var"; then
@@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
]])
@@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
]])
Index: libtool-2.5.0/tests/testsuite
===================================================================
--- libtool-2.5.0.orig/tests/testsuite
+++ libtool-2.5.0/tests/testsuite
@@ -49054,7 +49054,7 @@ $at_traceon; }
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
#???
if test PATH = "$shlibpath_var"; then
@@ -49269,7 +49269,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -49463,7 +49463,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -49821,7 +49821,7 @@ $at_traceon; }
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
#???
if test PATH = "$shlibpath_var"; then
@@ -50036,7 +50036,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50230,7 +50230,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50588,7 +50588,7 @@ $at_traceon; }
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
#???
if test PATH = "$shlibpath_var"; then
@@ -50803,7 +50803,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50997,7 +50997,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF

6
meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch
View File

@ -17,7 +17,7 @@ Index: libtool-2.5.0/m4/libtool.m4
@@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq
dnl in case the user passed a directory name.
lt_sysroot=
case $with_libtool_sysroot in #(
case $with_sysroot in #(
- yes)
+ no)
if test yes = "$GCC"; then
@ -29,10 +29,10 @@ Index: libtool-2.5.0/m4/libtool.m4
+ yes|''|/)
+ ;; #(
/*)
lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"`
lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
;; #(
- no|'')
- ;; #(
*)
AC_MSG_RESULT([$with_libtool_sysroot])
AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])