From patchwork Mon Jun 3 13:39:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44614 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6778EC25B76 for ; Mon, 3 Jun 2024 13:39:47 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web11.83697.1717421982210490809 for ; Mon, 03 Jun 2024 06:39:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=GY02cJFy; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4212f0444efso23455075e9.1 for ; Mon, 03 Jun 2024 06:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1717421980; x=1718026780; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=u2EeJInJVl2ZQ8VElPT9ZUXfUt+slHkaf3wxJ2dsZXQ=; b=GY02cJFyrzRYGjxhkKg0pDX97Zgi6d/eBfXw/TDCjtwCALGjKQ6kBXNHiUTG57Tetl JccfUJipCN4QfHSm5v8U0/WB5z6pCxDVKhjT/QWzMHDmHJG915P84Z/gZTvXANkJ2oQt IQEmun8psCOZgmgFYSpJYvFdI6Ge716/stLyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717421980; x=1718026780; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u2EeJInJVl2ZQ8VElPT9ZUXfUt+slHkaf3wxJ2dsZXQ=; b=Zf4a2A3VW9dIcKHD98ee71X8cNBFCIjUUaHrs2wHV4nuAZveW3WRu/o18HfxX1oQhK dxgdOVlax5u+sLvuGxiTKrYwWZuSfMQtGvmSqDTBttAr+zJD1BRJBe4pohrutken0iJQ 4B8tKq2rHHdYx4rfUHNe68ilNeTDf8Nb2E7lF6n0NeSu1MPCuTo7TfJnpUiTxyxSjNcz SdnS8E8GwG/pzFakQ8e/4WLpKb5q+PCfiX+KoSfYzRh/0ogYT3oWmjXNIC291P/gZhDG fmY5jSvD1hb/9I2CtzzB3k9WNwNVEkNr9MwbjYwscsRRbKrHg2kk4WMi9SrpvXZQVGOq ZODQ== X-Gm-Message-State: AOJu0YxpDq25xLhzDNowHl3oPahV0QW7lYWqUapDyAwNjpYAVg0bu1u9 6LAGwo1T/J3yYWRtDxeydbSU5fxrZcHs6YOFict/RwQtCRHnZa12Q+4i24D9LeBG5UAf2BQYsVD t X-Google-Smtp-Source: AGHT+IGIXUp2izHOg6FkTsCA5S2RcmfNC948oNn706jTvy615t1dDwRYs2qYiPKjz+YhlliTDrhBrQ== X-Received: by 2002:a05:600c:3b1e:b0:41d:d406:9416 with SMTP id 5b1f17b1804b1-4212e0ae495mr73181305e9.34.1717421979509; Mon, 03 Jun 2024 06:39:39 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3a80:acf7:af1d:55dc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b8a4cc0sm117581735e9.30.2024.06.03.06.39.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 06:39:39 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] libtool: 2.4.7 -> 2.5.0 Date: Mon, 3 Jun 2024 14:39:35 +0100 Message-Id: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 03 Jun 2024 13:39:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200249 Whilst this is an alpha release, it makes sense for us to stay close to upstream. We can drop a lot of merged patches which is great to see. During testing, one bug showed up, particularly on mip64 due to an issue with FILECMD being changed to use AC_CHECK_PROG incorredly. A patch has been added for that and sent upstream. Signed-off-by: Richard Purdie --- .../{libtool-2.4.7.inc => libtool-2.5.0.inc} | 16 ++--- ...-cross_2.4.7.bb => libtool-cross_2.5.0.bb} | 0 ...ative_2.4.7.bb => libtool-native_2.5.0.bb} | 0 ...-trailing-slashes-on-install-command.patch | 13 ++-- ...in.in-Parse-additional-clang-options.patch | 33 ---------- ...e-the-with-sysroot-option-to-avoid-c.patch | 43 ++++++------- ...-libtool.m4-Cleanup-sysroot-trailing.patch | 37 ------------ ...-Add-missing-sysroot-to-library-path.patch | 16 +++-- ...sroot-paths-being-encoded-into-RPATH.patch | 17 +++--- ...encode-RATHS-which-match-default-lin.patch | 17 +++--- ...ool.m4-Handle-as-a-sysroot-correctly.patch | 10 ++-- ...tool-Fix-support-for-NIOS2-processor.patch | 60 ------------------- ...r-static-libs-for-internal-compiler-.patch | 17 +++--- ...-sure-autoheader-run-before-autoconf.patch | 31 ---------- ...-sure-autoheader-run-before-automake.patch | 33 ---------- ...-prefix-map-compiler-options-correct.patch | 37 ------------ ...eproducibility-stop-encoding-hostnam.patch | 29 --------- .../libtool/libtool/filefix.patch | 30 ++++++++++ .../{libtool_2.4.7.bb => libtool_2.5.0.bb} | 0 ...ol_2.4.7.bb => nativesdk-libtool_2.5.0.bb} | 0 20 files changed, 96 insertions(+), 343 deletions(-) rename meta/recipes-devtools/libtool/{libtool-2.4.7.inc => libtool-2.5.0.inc} (70%) rename meta/recipes-devtools/libtool/{libtool-cross_2.4.7.bb => libtool-cross_2.5.0.bb} (100%) rename meta/recipes-devtools/libtool/{libtool-native_2.4.7.bb => libtool-native_2.5.0.bb} (100%) delete mode 100644 meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch create mode 100644 meta/recipes-devtools/libtool/libtool/filefix.patch rename meta/recipes-devtools/libtool/{libtool_2.4.7.bb => libtool_2.5.0.bb} (100%) rename meta/recipes-devtools/libtool/{nativesdk-libtool_2.4.7.bb => nativesdk-libtool_2.5.0.bb} (100%) diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc similarity index 70% rename from meta/recipes-devtools/libtool/libtool-2.4.7.inc rename to meta/recipes-devtools/libtool/libtool-2.5.0.inc index 16bb10d48f8..dd6215476e8 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc @@ -8,26 +8,22 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " -SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ +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 \ file://dont-depend-on-help2man.patch \ - file://0003-libtool.m4-Cleanup-sysroot-trailing.patch \ file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ - file://nohardcodepaths.patch \ - file://0007-libtool-Fix-support-for-NIOS2-processor.patch \ file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ - file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ - file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \ - file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \ - file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \ - file://0001-ltmain.in-Parse-additional-clang-options.patch \ + file://nohardcodepaths.patch \ + file://filefix.patch \ " -SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" + + +SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" do_compile:prepend () { # Sometimes this file doesn't get rebuilt, force the issue diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb rename to meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-native_2.4.7.bb rename to meta/recipes-devtools/libtool/libtool-native_2.5.0.bb diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch index 51c0c52da8f..d5d906e6b62 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch @@ -14,11 +14,11 @@ Signed-off-by: Richard Purdie Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index a5f21a1..f884824 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -2381,8 +2381,14 @@ func_mode_install () +Index: libtool-2.5.0/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.0.orig/build-aux/ltmain.in ++++ libtool-2.5.0/build-aux/ltmain.in +@@ -2382,8 +2382,14 @@ func_mode_install () func_append dir "$objdir" if test -n "$relink_command"; then @@ -34,6 +34,3 @@ index a5f21a1..f884824 100644 # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch deleted file mode 100644 index c52083327c4..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch +++ /dev/null @@ -1,33 +0,0 @@ -ltmain.in: Parse additional clang options - -clang uses -rtlib and --unwindlib to select proper compiler -runtime in some cases. Therefore pass these options to linker when found in -ldflags - -* build-aux/ltmain.in: Handle clang linker options - -Signed-off-by: Richard Purdie -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=725646bf095bf5c07c49ae38dd060f95bd95ae3c] - ---- - build-aux/ltmain.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 037f009..ba5c816 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5414,10 +5414,12 @@ func_mode_link () - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC - # -f{file|debug|macro|profile}-prefix-map* needed for lto linking -+ # -rtlib=* select c runtime lib with clang -+ # --unwindlib=* select unwinder library with clang - # -Wa,* Pass flags directly to the assembler - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch index 2126f829537..156622bb54b 100644 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch @@ -13,11 +13,11 @@ 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.4.7/m4/libtool.m4 +Index: libtool-2.5.0/m4/libtool.m4 =================================================================== ---- libtool-2.4.7.orig/m4/libtool.m4 -+++ libtool-2.4.7/m4/libtool.m4 -@@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr +--- 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]) @@ -37,7 +37,8 @@ Index: libtool-2.4.7/m4/libtool.m4 +case $with_libtool_sysroot in #( yes) if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` + # Trim trailing / since we'll always append absolute paths and we want +@@ -1261,12 +1261,12 @@ case $with_sysroot in #( fi ;; #( /*) @@ -52,10 +53,10 @@ Index: libtool-2.4.7/m4/libtool.m4 AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac -Index: libtool-2.4.7/tests/sysroot.at +Index: libtool-2.5.0/tests/sysroot.at =================================================================== ---- libtool-2.4.7.orig/tests/sysroot.at -+++ libtool-2.4.7/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]) @@ -83,11 +84,11 @@ Index: libtool-2.4.7/tests/sysroot.at AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) -diff --git a/tests/testsuite b/tests/testsuite -index 24265e4..d388e3e 100755 ---- a/tests/testsuite -+++ b/tests/testsuite -@@ -48997,7 +48997,7 @@ $at_traceon; } +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" @@ -96,7 +97,7 @@ index 24265e4..d388e3e 100755 #??? if test PATH = "$shlibpath_var"; then -@@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49269,7 +49269,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -105,7 +106,7 @@ index 24265e4..d388e3e 100755 AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49463,7 +49463,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -114,7 +115,7 @@ index 24265e4..d388e3e 100755 AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -49761,7 +49761,7 @@ $at_traceon; } +@@ -49821,7 +49821,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -123,7 +124,7 @@ index 24265e4..d388e3e 100755 #??? if test PATH = "$shlibpath_var"; then -@@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50036,7 +50036,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -132,7 +133,7 @@ index 24265e4..d388e3e 100755 AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50230,7 +50230,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -141,7 +142,7 @@ index 24265e4..d388e3e 100755 AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50525,7 +50525,7 @@ $at_traceon; } +@@ -50588,7 +50588,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -150,7 +151,7 @@ index 24265e4..d388e3e 100755 #??? if test PATH = "$shlibpath_var"; then -@@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50803,7 +50803,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -159,7 +160,7 @@ index 24265e4..d388e3e 100755 AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50997,7 +50997,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT diff --git a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch deleted file mode 100644 index 6d922382ef1..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch +++ /dev/null @@ -1,37 +0,0 @@ -libtool.m4: Cleanup sysroot trailing "/" - -If $CC has --sysroot=/, it is a valid configuration however libtool will -then set lt_sysroot to "/". - -This means references like $lt_sysroot$libdir become //usr/lib instead -of the more normally expected /usr/lib. This may or may not break something -but certainly is confusing to the user and gives confusing output. Making -"/" simply unset lt_sysroot is much cleaner. - -Whilst here, trim any trailing '/' from sysroot paths to drop the duplication -and result in cleaner/consistent output. - -* m4/libtool.m4: Cleanup sysroot trailing '/' handling - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=365805327c7b9bbdb0e622b954b6b0d8eaeb3f99] -Signed-off-by: Richard Purdie - ---- - m4/libtool.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index fa1ae91..2f31d24 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1256,7 +1256,9 @@ lt_sysroot= - case $with_libtool_sysroot in #( - yes) - if test yes = "$GCC"; then -- lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ # Trim trailing / since we'll always append absolute paths and we want -+ # to avoid //, if only for less confusing output for the user. -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` - fi - ;; #( - /*) diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch index 35f48ef906a..2436f68a49a 100644 --- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch +++ b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch @@ -8,13 +8,14 @@ i.e. when lt_sysroot is not set, it will still behave the same and add Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] +Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=3221f9f0fb98d5740ab5d0e8db6a731302520644] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index f884824..25a91de 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -6503,7 +6503,7 @@ func_mode_link () +Index: libtool-2.5.0/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.0.orig/build-aux/ltmain.in ++++ libtool-2.5.0/build-aux/ltmain.in +@@ -6514,7 +6514,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it. @@ -23,6 +24,3 @@ index f884824..25a91de 100644 # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch index 9203302182d..a6b3313d716 100644 --- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch +++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch @@ -9,11 +9,11 @@ Signed-off-by: Richard Purdie Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 25a91de..40cb94a 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -7682,9 +7682,11 @@ EOF +Index: libtool-2.5.0/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.0.orig/build-aux/ltmain.in ++++ libtool-2.5.0/build-aux/ltmain.in +@@ -7584,9 +7584,11 @@ func_mode_link () test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -27,7 +27,7 @@ index 25a91de..40cb94a 100644 if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir else -@@ -8414,6 +8416,10 @@ EOF +@@ -8316,6 +8318,10 @@ func_mode_link () hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -38,7 +38,7 @@ index 25a91de..40cb94a 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir -@@ -8465,6 +8471,10 @@ EOF +@@ -8367,6 +8373,10 @@ func_mode_link () hardcode_libdirs= for libdir in $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -49,6 +49,3 @@ index 25a91de..40cb94a 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch index 8b6352b01b4..54e602f1182 100644 --- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch +++ b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch @@ -12,11 +12,11 @@ Signed-off-by: Richard Purdie Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 40cb94a..2fa055e 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -7700,8 +7700,16 @@ EOF +Index: libtool-2.5.0/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.0.orig/build-aux/ltmain.in ++++ libtool-2.5.0/build-aux/ltmain.in +@@ -7602,8 +7602,16 @@ func_mode_link () esac fi else @@ -35,7 +35,7 @@ index 40cb94a..2fa055e 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8434,8 +8442,16 @@ EOF +@@ -8336,8 +8344,16 @@ func_mode_link () esac fi else @@ -54,7 +54,7 @@ index 40cb94a..2fa055e 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8489,8 +8505,14 @@ EOF +@@ -8391,8 +8407,14 @@ func_mode_link () esac fi else @@ -71,6 +71,3 @@ index 40cb94a..2fa055e 100644 fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch index c104e904cc4..435c52c7301 100644 --- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch +++ b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch @@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of d m4/libtool.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 2f31d24..bd90775 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1254,18 +1254,18 @@ dnl lt_sysroot will always be passed unquoted. We quote it here +Index: libtool-2.5.0/m4/libtool.m4 +=================================================================== +--- libtool-2.5.0.orig/m4/libtool.m4 ++++ 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 #( diff --git a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch deleted file mode 100644 index 676ce7fd1ba..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch +++ /dev/null @@ -1,60 +0,0 @@ -libtool: Fix support for NIOS2 processor - -The name of the system contains the string "nios2". This string -is caught by the some of the greedy checks for OS/2 in libtool, -in particular the *os2* branches of switch statements match for -the nios2 string, which results in incorrect behavior of libtool. - -Switch to use $host_os instead of $host and tweak the patterns to -match to avoid this problem for nios2. - -* build-aux/ltmain.in: Fix NIOS2 support ---- - build-aux/ltmain.in | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -Signed-off-by: Richard Purdie - -Submitted: https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html -Reworked and submitted: https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00068.html -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=49e6cb0d4dfdca2a59b909dc4532fe22dbc57ad5] - -Index: libtool-2.4.7/build-aux/ltmain.in -=================================================================== ---- libtool-2.4.7.orig/build-aux/ltmain.in -+++ libtool-2.4.7/build-aux/ltmain.in -@@ -518,10 +518,10 @@ libtool_validate_options () - # preserve --debug - test : = "$debug_cmd" || func_append preserve_args " --debug" - -- case $host in -+ case $host_os in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 -- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) -+ cygwin* | mingw* | pw32* | cegcc* | solaris2* | os2*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; -@@ -6273,8 +6273,8 @@ func_mode_link () - fi - if test -n "$library_names" && - { test no = "$use_static_libs" || test -z "$old_library"; }; then -- case $host in -- *cygwin* | *mingw* | *cegcc* | *os2*) -+ case $host_os in -+ cygwin* | mingw* | cegcc* | os2*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no -@@ -6343,8 +6343,8 @@ func_mode_link () - soname=$dlname - elif test -n "$soname_spec"; then - # bleh windows -- case $host in -- *cygwin* | mingw* | *cegcc* | *os2*) -+ case $host_os in -+ cygwin* | mingw* | cegcc* | os2*) - func_arith $current - $age - major=$func_arith_result - versuffix=-$major diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch index c151c3b4813..c103ebb7bfc 100644 --- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch +++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch @@ -15,19 +15,16 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index bd90775..3794130 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then +Index: libtool-2.5.0/m4/libtool.m4 +=================================================================== +--- libtool-2.5.0.orig/m4/libtool.m4 ++++ libtool-2.5.0/m4/libtool.m4 +@@ -7553,7 +7553,7 @@ if AC_TRY_EVAL(ac_compile); then for p in `eval "$output_verbose_link_cmd"`; do case $prev$p in - -L* | -R* | -l*) + -L* | -R* | -l* | */libclang_rt.*.a) - # Some compilers place space between "-{L,R}" and the path. + # Some compilers place space between "-{L,R,l}" and the path. # Remove the space. - if test x-L = "$p" || --- -2.25.1 - + if test x-L = x"$p" || diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch deleted file mode 100644 index f51deecbef2..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Mingli Yu -Subject: [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf - -autoheader will update ../libtool-2.4.6/libltdl/config-h.in which -autoconf needs, so there comes a race sometimes as below: - | configure.ac:45: error: required file 'config-h.in' not found - | touch '../libtool-2.4.6/libltdl/config-h.in' - -So make sure autoheader run before autoconf to avoid this race. - -Signed-off-by: Mingli Yu -Signed-off-by: Richard Purdie - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a] - -diff --git a/Makefile.am b/Makefile.am -index c29860e..9c34bfd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) - $(lt_aclocal_m4): $(lt_aclocal_m4_deps) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 - --$(lt_configure): $(lt_configure_deps) -+$(lt_configure): $(lt_configure_deps) $(lt_config_h_in) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF) - - $(lt_config_h_in): $(lt_configure_deps) --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch deleted file mode 100644 index e451de59e33..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Mingli Yu -Subject: [PATCH 10/12] Makefile.am: make sure autoheader run before automake - -When use automake to generate Makefile.in from Makefile.am, there -comes below race: - | configure.ac:45: error: required file 'config-h.in' not found - -It is because the file config-h.in in updating process by autoheader, -so make automake run after autoheader to avoid the above race. - -Signed-off-by: Mingli Yu -Signed-off-by: Richard Purdie - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e01c0bfe5e041418d84460901a1a5b11b89d596f] - -Signed-off-by: Mingli Yu - -diff --git a/Makefile.am b/Makefile.am -index 9c34bfd..231ef3f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ - $(lt_obsolete_m4) \ - $(stamp_mk) - --$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) -+$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile - - # Don't let unused scripts leak into the libltdl Makefile --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch deleted file mode 100644 index 4c6b6f05b49..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ /dev/null @@ -1,37 +0,0 @@ -ltmain.in: Handle prefix-map compiler options correctly - -If lto is enabled, we need the prefix-map variables to be passed to the linker -to correctly link the objects using correctly mapped paths. - -Add these to the list of options libtool passes through. - -* build-aux/ltmain.in: Handle prefix-map compiler options - -Signed-off-by: Richard Purdie - -https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html -https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00066.html -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=cdf4bf702f11d17e06569936e8a433a77f791228] - ---- - build-aux/ltmain.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 0a50f5b..037f009 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5413,11 +5413,12 @@ func_mode_link () - # -stdlib=* select c++ std lib with clang - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC -+ # -f{file|debug|macro|profile}-prefix-map* needed for lto linking - # -Wa,* Pass flags directly to the assembler - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -- -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) -+ -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result - func_append compile_command " $arg" diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch deleted file mode 100644 index 8469b8727e1..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Richard Purdie -Subject: [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script - -For reproducibilty, stop encoding the hostname into the libtool script, this isn't -really adding much to debugging and most distros are carrying such a patch now as -reproducibility is important. - -Signed-off-by: Richard Purdie - -https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ - no_hostname.patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89] - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 3794130..84a550c 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([ - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/filefix.patch b/meta/recipes-devtools/libtool/libtool/filefix.patch new file mode 100644 index 00000000000..4d851329549 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/filefix.patch @@ -0,0 +1,30 @@ +[PATCH] libtool.m4: Fix AC_CHECK_PROG usage + +In commit: + +https://git.savannah.gnu.org/cgit/libtool.git/commit/m4/libtool.m4?id=64bef5ba65f6820cd5f88e5249324b4f5955ee25 + +AC_CHECK_TOOL was changed to AC_CHECK_PROG however the arguments are +different and this result is a value of ":". Change this to match the +original intent. + +The lack of FILECMD was causing failures for mips64 builds as -m elf was +being passed to LD which isn't supported on our targets. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-06/msg00000.html] + +Signed-off-by: Richard Purdie + +Index: libtool-2.5.0/m4/libtool.m4 +=================================================================== +--- libtool-2.5.0.orig/m4/libtool.m4 ++++ libtool-2.5.0/m4/libtool.m4 +@@ -8216,7 +8216,7 @@ AC_SUBST([DLLTOOL]) + # ---------------- + # Check for a file(cmd) program that can be used to detect file type and magic + m4_defun([_LT_DECL_FILECMD], +-[AC_CHECK_PROG([FILECMD], [file], [:]) ++[AC_CHECK_PROG([FILECMD], [file], [file], [:]) + _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) + ])# _LD_DECL_FILECMD + diff --git a/meta/recipes-devtools/libtool/libtool_2.4.7.bb b/meta/recipes-devtools/libtool/libtool_2.5.0.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool_2.4.7.bb rename to meta/recipes-devtools/libtool/libtool_2.5.0.bb diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb similarity index 100% rename from meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb rename to meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb From patchwork Mon Jun 3 13:39:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A55A9C27C52 for ; Mon, 3 Jun 2024 13:39:47 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web10.83717.1717421982430284829 for ; Mon, 03 Jun 2024 06:39:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=WVqU+bwd; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-421396e3918so16862915e9.0 for ; Mon, 03 Jun 2024 06:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1717421980; x=1718026780; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GvbxC8iDM1w2mtiXjxBFYqFTKNmAaU6SSfNz3rZicO8=; b=WVqU+bwd1oePB9sriL6ikO3Jvjg73jmG/3EIqEctwhcj1iL6gmG4HW7fbV6O74+2vj zv85h+R8XzThQ23oksFclQa8W7xEK7A7hCSiPqytZ1uWDWJNf4TZK5Im+5ZC1BvXvcAM UFtZA9XmR7aUiTJ1XanRTY+h9d2HWq8iAuxKE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717421980; x=1718026780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GvbxC8iDM1w2mtiXjxBFYqFTKNmAaU6SSfNz3rZicO8=; b=nXAHq8Gr7kgSHJzRauNX+3i6wlddHuxBrGFYu/VQwl3lTIBoDOhx8sFKGhGiyl6TC6 YwvwIr6JmY3hROeCaihUaa70ib7ZGZxzfptJigzut89+ybs+XLj8sw3pr1+8WpjDoXaz LRptAgeRIZDMRBdnX0sznwoy6HCBOFaDWDbLYZNlZ033jJ6YLOcA3sTV0uuNvQlgtqUV AkYHsVOSjQ76Sv281QoYLvvw/nM612KASuzAqREJor5zq5rraWiMUJnKIe+tIRwvWCPn 9BOsRjMTpgLJb7CkhrqPk/oVkqR1gYf0i8wZQNngliREYX/PgwL0nwQ5RQXRIKQwkhYF hqdg== X-Gm-Message-State: AOJu0YxPLPvkFqhi7wNvAuB1MIi/APrNHp42KrSpKUt4VC9NE8r2lV0M UelLFmgmaW1fS5z54PgR26mUA/HFzbfVROB1DGweEigWYomHKKZNF/EPPufEQjuQm0Hsfph2Xl3 d X-Google-Smtp-Source: AGHT+IGHvmQFqBLRAvNjk6I0sgobHJTs60QCoTFASJQVLUu4x0o2/YBmPFNIV640h62ALbugXwLs6w== X-Received: by 2002:a05:600c:4450:b0:41b:e244:164a with SMTP id 5b1f17b1804b1-4212e046b5bmr81573535e9.6.1717421980477; Mon, 03 Jun 2024 06:39:40 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3a80:acf7:af1d:55dc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b8a4cc0sm117581735e9.30.2024.06.03.06.39.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 06:39:40 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] autotools/libtool: Drop libtool sysroot patch as not needed Date: Mon, 3 Jun 2024 14:39:36 +0100 Message-Id: <20240603133938.3552266-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> References: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 03 Jun 2024 13:39:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200250 Signed-off-by: Richard Purdie --- meta/classes-global/insane.bbclass | 2 +- meta/classes-recipe/autotools.bbclass | 9 +- .../libtool/libtool-2.5.0.inc | 1 - .../libtool/libtool-native_2.5.0.bb | 2 +- ...e-the-with-sysroot-option-to-avoid-c.patch | 171 ------------------ ...ool.m4-Handle-as-a-sysroot-correctly.patch | 6 +- 6 files changed, 6 insertions(+), 185 deletions(-) delete mode 100644 meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 151cf0c4eac..822d190a304 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -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 ?= " \ diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 7ee1b0d9c74..9ebdca47680 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -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 ?= "" diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index dd6215476e8..a609de6369b 100644 --- a/meta/recipes-devtools/libtool/libtool-2.5.0.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc @@ -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 \ diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb index 19024f7830c..90c06f0ec3f 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb @@ -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 diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch deleted file mode 100644 index 156622bb54b..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ /dev/null @@ -1,171 +0,0 @@ -From: Khem Raj -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 - -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 diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch index 435c52c7301..feb1048b554 100644 --- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch +++ b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch @@ -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.]) From patchwork Mon Jun 3 13:39:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BF7FC41513 for ; Mon, 3 Jun 2024 13:39:47 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web11.83698.1717421982851229596 for ; Mon, 03 Jun 2024 06:39:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Frl4SgYz; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.50, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-421338c4c3bso21798785e9.1 for ; Mon, 03 Jun 2024 06:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1717421981; x=1718026781; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=I6qwOQNpE9a65UcdeTt88uJCYzjd2pkPKvEh2V5CLwU=; b=Frl4SgYzAoEUWpvxQgiTwxr6+XuFZTq3ebKRWoEtwWM48/8+1b8EBeXFHhkYgeauoh nL5Mh1jTpE68AL/X1eh5uHvau66yq2wiw5DHuQv5Z8VSXvkRJmB3sjU9gUyMKYqSl1Yq L+XGt7fJPW7O0Jw8RivtiOfSaMs8bnUSoUrT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717421981; x=1718026781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I6qwOQNpE9a65UcdeTt88uJCYzjd2pkPKvEh2V5CLwU=; b=hdla7qLEigS6Fmz9BwNGZUtW6XIsY5+eOLk15KLM4Qkspo+Vh9Q9tEroSpBtH7I5u3 DjfM5PBEZGWHeo3S8ZZG3N4jU2Mk+rTTfHOF+4oZvRACuqdwyu7IHO5At/S8w6RGpwnm GqZccpWGIWLg2e2dF+CfVD2tLMRYUcHoWnYyQEAV0U1U1ZXXRKx/Ny/IDwPBpcm+3UQu JYfV1utJuRm3ZpTHeg7+POWh2GkumaD8Ay/0n0tpQwX83/K2EcBQqOpqio6nTqPuIIVc O42LkpwVfbxgFISlTFDIVntvMRXZtwu9aHS79dO+ptzzHzqmjLMLCqgGBcE3eD4yBATL AK1Q== X-Gm-Message-State: AOJu0Yx3nHgFINFhyXJGY/NIC/jiCkBlF76IDDozu0VdOfk5EAhxRfKU rXMlrbKWqDK0brpwlTFyvOLuyvWrtAx1WP8btF9PiG/BARTQqd7JjBLPjzwOv7AzE7Za+P8XGue v X-Google-Smtp-Source: AGHT+IHdasa+5tgBTWxV1fPwkuPtDQIcUE7pMg8+c/qfgCBdbQF/FZ9bHot1+p7RWlRfhRi8l39YHQ== X-Received: by 2002:a05:600c:4744:b0:420:98d:e101 with SMTP id 5b1f17b1804b1-4212e04a3aamr66795935e9.15.1717421981184; Mon, 03 Jun 2024 06:39:41 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3a80:acf7:af1d:55dc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b8a4cc0sm117581735e9.30.2024.06.03.06.39.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 06:39:40 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] libtool-native: Drop obsolete systroot config Date: Mon, 3 Jun 2024 14:39:37 +0100 Message-Id: <20240603133938.3552266-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> References: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 03 Jun 2024 13:39:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200251 I can't see any reason this configure like for a sysroot is needed in the native config and it doesn't make any sense. Drop it as obsolete/unneeded. Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-native_2.5.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb index 90c06f0ec3f..92f4b463032 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb @@ -4,8 +4,6 @@ DEPENDS = "" inherit native -EXTRA_OECONF = " --with-sysroot=${STAGING_DIR_NATIVE}" - do_configure:prepend () { # Remove any existing libtool m4 since old stale versions would break # any upgrade From patchwork Mon Jun 3 13:39:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 44612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B99BC25B75 for ; Mon, 3 Jun 2024 13:39:47 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.83699.1717421983864556742 for ; Mon, 03 Jun 2024 06:39:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=YGms+jdp; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4213485697fso18689955e9.1 for ; Mon, 03 Jun 2024 06:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1717421982; x=1718026782; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BukjVa5S942BO7gW9rkUdPmn20VU3PpZweG7xxdHwwQ=; b=YGms+jdpg3mFuwi+Aig4QOgN7VcmzSQGn0DL9yJ4iMjsf37qNce8HOW282kkhq4wrM rRNAfIoAoRvCLHm7JDttd9SvJEAJ8hYQDOqbLVSoPEnY5GxhW78Kuw+9jwtnhabDwWsr ir9k6i+v2YJEenWfHBZ+R3UlzjxiFWHyJ8aVs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717421982; x=1718026782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BukjVa5S942BO7gW9rkUdPmn20VU3PpZweG7xxdHwwQ=; b=NshUjWma0WKMTyGm4Ps9E1JkUYLYKadjpsASZjapt0JKlzX0nxD7n/Z7GuuOcbQ4bb aFK2acVnvOb2j7N+s8c4miRvVfgCwz3WZ5WRWfFnJdxzT5WUSErlmdvhDzCxHDINd17Z jmKUc+zMqCruUlvZ1u7tc6yv+C9CfN7sxYRyL9Wm4FWwuHBI/mRF5XdU5C4TtNbrQ3it oEaU2bbrgva5C1mB7u/oOivOolcvjxKMn2pi1SK5jl2IzcDN/zTU5pHYe/ZKpHmKw7wJ f48U/blD/VP+7kNDE3rNq6dbalRjog0bnzCUT/8PTxVWjV40vjbtMRiqcRXWGP7SEYib b0Fw== X-Gm-Message-State: AOJu0Yw9EzFLeD8mBFtiNVpZYZkcRkmi40AT8Lhk0YwUe3DuZ59CnF5t kSEVBP2TD4uW0UJ1OVe++srKq8uBIf6sSBIBi2gJiOkGVEk+bgnKmEyrIsgsnNkvBNY9/U66+ZX Q X-Google-Smtp-Source: AGHT+IGx/qmeWhZYq7ZI5w/mkcgTnias6CJB4VjH00ByFatipF9eW2Y51A1FlvqvCsHIOd2k0wX1Cw== X-Received: by 2002:a05:600c:5113:b0:41b:f3b6:e5da with SMTP id 5b1f17b1804b1-4212e0c3fc1mr83797415e9.36.1717421982121; Mon, 03 Jun 2024 06:39:42 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3a80:acf7:af1d:55dc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4212b8a4cc0sm117581735e9.30.2024.06.03.06.39.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 06:39:41 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] libtool: Drop obsolete configure/compile prepends Date: Mon, 3 Jun 2024 14:39:38 +0100 Message-Id: <20240603133938.3552266-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> References: <20240603133938.3552266-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 03 Jun 2024 13:39:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200252 The introduction of sstate and recipe specific sysroots made the configure prepends obsolete and unneeded. The compile prepend has been there for over a decade and is also likely obsolete. Remove the whole lot, we look into any issues that arise. Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-2.5.0.inc | 7 ------- meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb | 7 ------- meta/recipes-devtools/libtool/libtool-native_2.5.0.bb | 7 ------- meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb | 7 ------- 4 files changed, 28 deletions(-) diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index a609de6369b..e0c9aae387a 100644 --- a/meta/recipes-devtools/libtool/libtool-2.5.0.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc @@ -24,13 +24,6 @@ SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" -do_compile:prepend () { - # Sometimes this file doesn't get rebuilt, force the issue - rm -f ${S}/build-aux/ltmain.sh - make build-aux/ltmain.sh - ./config.status -} - inherit autotools texinfo EXTRA_AUTORECONF = "--exclude=libtoolize" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb index 93f1dd7825d..18849cb8ef6 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb @@ -7,13 +7,6 @@ datadir = "${STAGING_DIR_TARGET}${target_datadir}" inherit nopackages -do_configure:prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - # # ccache may or may not be INHERITED, we remove references to it so the sstate # artefact works on a machine where its not present. libtool-cross isn't used diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb index 92f4b463032..be96b52dd66 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb @@ -4,13 +4,6 @@ DEPENDS = "" inherit native -do_configure:prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - do_install () { autotools_do_install install -d ${D}${bindir}/ diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb index 86c55ded7b6..ddb60e717ca 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb @@ -9,13 +9,6 @@ inherit nativesdk S = "${WORKDIR}/libtool-${PV}" FILES:${PN} += "${datadir}/libtool/*" -do_configure:prepend () { - # Remove any existing libtool m4 since old stale versions would break - # any upgrade - rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 - rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 -} - do_install () { autotools_do_install install -d ${D}${bindir}/