From patchwork Wed Jan 17 13:08:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 37967 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 EE4DAC47DA2 for ; Wed, 17 Jan 2024 13:08:28 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.1531.1705496906095026597 for ; Wed, 17 Jan 2024 05:08:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=UnvT/ugu; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.52, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40e586a62f7so89386895e9.2 for ; Wed, 17 Jan 2024 05:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1705496904; x=1706101704; 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=enzrwlNoMBD5du3WFjoYx0aMhvhGmrDcpVXT0AwTEGg=; b=UnvT/ugubx86/41ggcTqHpc0Iqbk3FrR8WwGG4OZEBHCmIMWbRsuXQTreoNnIQ8dR9 ZCjj8RQvPhsTeXzvc2YD5HcqHkbo9Uco0oF5yUNwJeVJoUI1jm2bheWd/U1cwYod3VrI KWFrL9C7v//ZG4YKJ9ePrhNaBowcDDBmqMmv8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705496904; x=1706101704; 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=enzrwlNoMBD5du3WFjoYx0aMhvhGmrDcpVXT0AwTEGg=; b=cY5DatBmbwqr0E28VQgA5RDqXTMONcv1owpvz7kQktlZUyF0IU6av8Jy0aowibPU1c ODK85cSTV8SzplIm4N166qDvvnrQjBtyQSyfvxWCfMf/BMTXFO0VQyg4NGL6XF5rk/Tb aWVysWjuqyukhlExuv14yaxkLSBBEKpVNNDJ5Llv0Jp2j/K+jSZ7LreiWZNfaDmVVM6Y vK+pJ6mVPk/LuxDx6I829QNBjJEBJUtrO59wllrW//X6B1vxL/9oanDAvp6RBStuU7Fj 45z+EfBlCyFly69Ca8rCcyQEdc/nfqD/aDG2MJxe9cundcUIqbfQBAVQ+K9q+RGz1ATK JcAw== X-Gm-Message-State: AOJu0YzDzYeDqQjyn5CUol2xYnD+QB4nM/kSqlz4mMJzSCE+JzJRPp5U EhFg3W1xwSm0cnWULnUFjpniuZd650oOQteifg+i/ArJ22g= X-Google-Smtp-Source: AGHT+IF+P96s0V9BABNm0PcarQxOMMvlL9jV7n0lqbF3+5iEjJn4xrvQQ2JvF9qmcVicnLQA1ugnMw== X-Received: by 2002:a1c:7c0d:0:b0:40e:7d24:cc15 with SMTP id x13-20020a1c7c0d000000b0040e7d24cc15mr2621143wmc.34.1705496903898; Wed, 17 Jan 2024 05:08:23 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3c1d:bf3d:325f:7bb3]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c1c9400b0040e54f15d3dsm26263349wms.31.2024.01.17.05.08.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 05:08:23 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/5] libtool: Update patches to mark as backports Date: Wed, 17 Jan 2024 13:08:18 +0000 Message-Id: <20240117130822.3928928-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 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 ; Wed, 17 Jan 2024 13:08:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193908 Several patches merged upstream, mark as such. Signed-off-by: Richard Purdie --- ...9-Makefile.am-make-sure-autoheader-run-before-autoconf.patch | 2 +- ...0-Makefile.am-make-sure-autoheader-run-before-automake.patch | 2 +- ...2-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 437c09fa6d4..1543ad2afd5 100644 --- 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 @@ -11,7 +11,7 @@ So make sure autoheader run before autoconf to avoid this race. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00015.html] +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a] diff --git a/Makefile.am b/Makefile.am index 6b546092..84795d87 100644 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 index a92e22905fa..67bd27ac928 100644 --- 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 @@ -11,7 +11,7 @@ so make automake run after autoheader to avoid the above race. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00020.html] +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e01c0bfe5e041418d84460901a1a5b11b89d596f] Signed-off-by: Mingli Yu 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 index c750303d430..b0f771c9bbc 100644 --- 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 @@ -10,7 +10,7 @@ Signed-off-by: Richard Purdie https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ no_hostname.patch -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00011.html] +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 022c1292..1a8a2998 100644 From patchwork Wed Jan 17 13:08:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 37966 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 EF8F5C47258 for ; Wed, 17 Jan 2024 13:08:28 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.1544.1705496906515324000 for ; Wed, 17 Jan 2024 05:08:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=aociWd7i; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.51, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40e86a76c11so14171895e9.2 for ; Wed, 17 Jan 2024 05:08:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1705496905; x=1706101705; 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=oDUiRVaXB98m6lHixE/3qW41L5ZMJQOj5+X/Bbq8jnc=; b=aociWd7ibjKT7T0EhbiekfsMtl9GpoG+azyp+Avzd3ePq1ZC/hsEv/IrpfYcH+IEIH V0j9fHertKN57sx1O6dIp5CPoa1sl18mOipNa6aoMWez4Pja5wbX4Zlyt2RQeIUkgQ5K fd+3Q52zRZau6l1UExp1U2n00Po9mWVHx2HIo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705496905; x=1706101705; 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=oDUiRVaXB98m6lHixE/3qW41L5ZMJQOj5+X/Bbq8jnc=; b=L7MZaVY9NQc7fbMIw1XXRjLer4a12Qa12xlaK7JfRaaj1hq3iWVrEU9WBkGqSicYDb MEqoEKNS++OmkbzDc0fGoNvPkHSglEhCkcwPQF7z0eXUxfthEywgZyevwfXajMxdn1aq YaRBSoZRvT28us65gmW1f7Na0aVCfCcm4BX597UlVKtyZhC1rvgPPIkhkwXv7j1xddY4 WUmUfZLLAkaolGesq0at8dD2m3NcaD9ag6GM9gxTMX/HYgneRj+DzjC6YpNYNisAcKm/ buCmGj/QJkyfZn+eIwHF2vKIJDTusR1ppuvXZDRmDWe13To2fB3NffWI6bcH/4/3Ra76 GA0Q== X-Gm-Message-State: AOJu0YyUesiRHFhHju6hK44MgTUfI0k46HZtz9JtA2UGDcFnVgNvW+RK dXezHJKzy2Q76M663jg3P3XVej0rgmzy9vdP2QqeVvp2X+4= X-Google-Smtp-Source: AGHT+IE4FeBiaGjyfXjaGmKYdl5363bwxrb71RyCi5Gy3qs83MjjeBzvnbbddV6T0pJFNTdZZxHDLg== X-Received: by 2002:a1c:4c08:0:b0:40e:61d9:492f with SMTP id z8-20020a1c4c08000000b0040e61d9492fmr3292476wmf.6.1705496904586; Wed, 17 Jan 2024 05:08:24 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3c1d:bf3d:325f:7bb3]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c1c9400b0040e54f15d3dsm26263349wms.31.2024.01.17.05.08.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 05:08:24 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/5] libtool: Update nios2 patch to match upstream merged version Date: Wed, 17 Jan 2024 13:08:19 +0000 Message-Id: <20240117130822.3928928-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240117130822.3928928-1-richard.purdie@linuxfoundation.org> References: <20240117130822.3928928-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 ; Wed, 17 Jan 2024 13:08:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193909 Update the patch to match the version merged upstream. Signed-off-by: Richard Purdie --- ...tool-Fix-support-for-NIOS2-processor.patch | 81 +++++++++---------- 1 file changed, 38 insertions(+), 43 deletions(-) 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 index 277afe0af62..676ce7fd1ba 100644 --- 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 @@ -1,65 +1,60 @@ -From: Marek Vasut -Subject: [PATCH 07/12] libtool: Fix support for NIOS2 processor +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. -This patch adds an explicit check for *nios2* before the *os2* -checks to prevent the OS/2 check incorrectly trapping the nios2 -as well. +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: Marek Vasut Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html] +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] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 6fb58ed2..606f17be 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -519,6 +519,12 @@ libtool_validate_options () +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 -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ *nios2*) -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps -+ ;; +- 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*) -@@ -6246,6 +6252,15 @@ func_mode_link () +- *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 -+ *nios2*) -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ if test no = "$installed"; then -+ func_append notinst_deplibs " $lib" -+ need_relink=yes -+ fi -+ ;; - *cygwin* | *mingw* | *cegcc* | *os2*) +- 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" -@@ -6316,6 +6331,11 @@ func_mode_link () + need_relink=no +@@ -6343,8 +6343,8 @@ func_mode_link () + soname=$dlname elif test -n "$soname_spec"; then # bleh windows - case $host in -+ *nios2*) -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ ;; - *cygwin* | mingw* | *cegcc* | *os2*) +- case $host in +- *cygwin* | mingw* | *cegcc* | *os2*) ++ case $host_os in ++ cygwin* | mingw* | cegcc* | os2*) func_arith $current - $age major=$func_arith_result --- -2.25.1 - + versuffix=-$major From patchwork Wed Jan 17 13:08:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 37965 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 01287C47DA9 for ; Wed, 17 Jan 2024 13:08:29 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.1532.1705496907077158703 for ; Wed, 17 Jan 2024 05:08:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Q6OLs4cg; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-40e80046264so29016645e9.0 for ; Wed, 17 Jan 2024 05:08:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1705496905; x=1706101705; 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=LvryT2Y8SYHfT+R29BLz71Ed+LTg7jdExt0ao4Q6j6o=; b=Q6OLs4cg5//vHAWbPajnZ2q6A8Mvo3z3iM2LrO6cVhYJk7n3h0VgBq2DLg8W/bffoc 4sBLURyNKtfu+XhVls1eIwJKPsU76hlIaoCfcYUoYpI5vYzjJls+iu6y2I/LNGpfOI3i YSBOqwQJjy0Uxdc81Vx4q5MKRzfjPCM/dDZmg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705496905; x=1706101705; 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=LvryT2Y8SYHfT+R29BLz71Ed+LTg7jdExt0ao4Q6j6o=; b=Hf5+gC1wu6y0QOq1sBPpUec+hSWL/kGD7ySgyME90ni7yk1pHnF3MJQNBeRb8mBaDZ PvTG2hGxWZt9f+ZsZaRhcXTGM7efHDY0iCc/WBzSzLCUWMwnI+86zUmV4WQwt1uAyks5 MVvQOy55iaWFrkPowMKZxOq0h48H/v6nfOSPiVtcKJzKjTKDH7NAMBSFMUg5G2vIYhHZ lL3A496DnoFPd5ITU6yzw7ZaLJdMznhHQg/PkhQWLnqvRTz6XYheqjMuj6iHW1uv7595 6PZrM16yFJnvKqhi/nrbJf9hTu0bmg6wul2473oULDinOdxVkP0vLSRI6lejdH2ucciI guqA== X-Gm-Message-State: AOJu0YyrjRto3q5XuHzOnAmVOPLAAq6br612IgeHwwbKsomo1AAAi+8R ferZnKyADu6142icnBkXMdfRTsoio5zgV3SoEnpKLl3hhpw= X-Google-Smtp-Source: AGHT+IGF3V+zxI+CR46taF3InmvjMvbLf0XgLz2FXMh19eKSlkN2Z+qIIoz2DfxntTs7/JpvziKz9A== X-Received: by 2002:a05:600c:144:b0:40e:4252:e26 with SMTP id w4-20020a05600c014400b0040e42520e26mr4758607wmm.69.1705496905203; Wed, 17 Jan 2024 05:08:25 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3c1d:bf3d:325f:7bb3]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c1c9400b0040e54f15d3dsm26263349wms.31.2024.01.17.05.08.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 05:08:24 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/5] libtool: Update prefixmap and clang patches to match upstream submission Date: Wed, 17 Jan 2024 13:08:20 +0000 Message-Id: <20240117130822.3928928-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240117130822.3928928-1-richard.purdie@linuxfoundation.org> References: <20240117130822.3928928-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 ; Wed, 17 Jan 2024 13:08:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193910 The patches were submitted upstream and adjusted after discussion. Update to match the changes requested. Signed-off-by: Richard Purdie --- ...in.in-Parse-additional-clang-options.patch | 31 +++++++++++-------- ...-prefix-map-compiler-options-correct.patch | 31 ++++++++++++------- 2 files changed, 38 insertions(+), 24 deletions(-) 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 index 0285c143d28..0dcf963dcca 100644 --- 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 @@ -1,21 +1,26 @@ -From: Khem Raj -Subject: [PATCH] ltmain.in: Parse additional clang options +ltmain.in: Parse additional clang options -clang uses -rtlib and --unwindlib to select proper compiler runtime in -some cases. There fore pass these options to linker when found in +clang uses -rtlib and --unwindlib to select proper compiler +runtime in some cases. Therefore pass these options to linker when found in ldflags -Upstream-Status: Pending -Signed-off-by: Khem Raj +* build-aux/ltmain.in: Handle clang linker options -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 -@@ -5420,10 +5420,12 @@ func_mode_link () +Signed-off-by: Richard Purdie +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00110.html] + +--- + 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*-prefix-map* needed for lto linking + # -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 @@ -23,6 +28,6 @@ Index: libtool-2.4.7/build-aux/ltmain.in -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=*|-f*-prefix-map*|-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 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 index 4945533badd..c0627795b45 100644 --- 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 @@ -1,28 +1,37 @@ -From: Richard Purdie -Subject: [PATCH 11/12] ltmain.in: Handle prefix-map compiler options correctly +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. -If lto is enabled, we need the prefix-map variables to be passed to the linker. Add these to the list of options libtool passes through. +* build-aux/ltmain.in: Handle prefix-map compiler options + Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html] +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: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00109.html] + +--- + build-aux/ltmain.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -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 -@@ -5419,11 +5419,12 @@ func_mode_link () +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*-prefix-map* needed for lto linking ++ # -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=*|-f*-prefix-map*|-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" From patchwork Wed Jan 17 13:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 37968 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 089BFC47DA7 for ; Wed, 17 Jan 2024 13:08:29 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web10.1533.1705496907662206144 for ; Wed, 17 Jan 2024 05:08:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=H5zzUk9T; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.46, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-40e88012233so9129345e9.0 for ; Wed, 17 Jan 2024 05:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1705496906; x=1706101706; 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=Wj8tptRYsdj8+Ua1xCfSC/wkkxQZWJsblUpl0py++PQ=; b=H5zzUk9TmVZUCZxcNGxy41uwv9BA73BjYaYQdPVt6LzwJxxXHX+aNTOz6DsM1Umn9c JVNdA0PpxPreZKDN+qTRWUOzHSeOOQjkVVFITGTGeBOtXbFpEIVYJXlE9yIgu7eK8sgL Qx2jKTEfI/VnyHBhM6pVM2R7gHB8Mtz6QHimU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705496906; x=1706101706; 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=Wj8tptRYsdj8+Ua1xCfSC/wkkxQZWJsblUpl0py++PQ=; b=TTiwWzEi+AbFiaLKakV6xAUiVCnclzipeFGXQCxRQCa0SlHoSvEZo2+pjS/XrQazgx tu6ptQIRZ56b6IK+p2vdwZJ1WbUMNdFRgcls2KpIAJH7qgmd96nNMey7uWaAsmRKaAvB ml8GmUkuL8oKALiVcjMF5scivx3zVSCikR7cjcCVITiUlt19kdVOKocI3FbyrnzmjtAI rCrzP8uWZO08Kb64sxJLPyIwD4pNZTMw/qGmNmVkrelIa9IDwyYBNtJxb2uQpoiAGgDs jxA4F0k9/RuTMgnNiWuBF0q+tuWXqB+r+W4ca2L8MvBNztdi6idF0WG6F4yK2Fi88NjZ cIlg== X-Gm-Message-State: AOJu0YyokC9YXuMO7TNPi7L8zT0wQpm3LP/epJjwqvyejRhMAkSarLWI AxqXoEUhSZF3zRs0uXoI2BoxczsAyiUn9AXeBIVgm7P9Z0o= X-Google-Smtp-Source: AGHT+IHYajbd+jcydIPxebuw9+aIAe+W5wvr1r3Gci6M4UJPu5UlcvD189ggItUUhsU7RQ7Io1vgaw== X-Received: by 2002:a05:600c:21d4:b0:40d:3112:a2d7 with SMTP id x20-20020a05600c21d400b0040d3112a2d7mr4419324wmj.187.1705496905976; Wed, 17 Jan 2024 05:08:25 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3c1d:bf3d:325f:7bb3]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c1c9400b0040e54f15d3dsm26263349wms.31.2024.01.17.05.08.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 05:08:25 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/5] libtool: Update cleanup sysroot handling patch Date: Wed, 17 Jan 2024 13:08:21 +0000 Message-Id: <20240117130822.3928928-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240117130822.3928928-1-richard.purdie@linuxfoundation.org> References: <20240117130822.3928928-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 ; Wed, 17 Jan 2024 13:08:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193911 The sysroot path cleanup change was reworked after discussion/review upstream. It appeared there were two different changes in one of our patches so separate out the second one and mark as inappropriate as it is unlikely upstream would take such a change in defaults. We need further investigation to decide if OE really wants/needs this going forward. Signed-off-by: Richard Purdie --- .../libtool/libtool-2.4.7.inc | 1 + ...-libtool.m4-Cleanup-sysroot-trailing.patch | 37 +++++++++++++++++++ ...ool.m4-Handle-as-a-sysroot-correctly.patch | 33 +++++++---------- 3 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.4.7.inc index a07df720acf..16bb10d48f8 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.7.inc @@ -15,6 +15,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 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 \ 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 new file mode 100644 index 00000000000..b6175903daf --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch @@ -0,0 +1,37 @@ +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: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00111.html] +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/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 a221dab5283..c104e904cc4 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 @@ -1,34 +1,29 @@ -From: Richard Purdie -Subject: [PATCH 06/12] libtool.m4: Handle "/" as a sysroot correctly +libtool.m4: Change libtool to handle sysroots by default -Update libtool.m4 to resolve a problem with lt_sysroot not being properly -updated if the option '--with[-libtool]-sysroot' is not provided when -running the 'configure' script for a package so that "/" as a sysroot -is handled correctly by libtool. +Rather than using no sysroot by default, always query gcc to obtain the sysroot. Signed-off-by: Richard Purdie -Upstream Report: -http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html +Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default] -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00018.html] +--- + m4/libtool.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: libtool-2.4.7/m4/libtool.m4 -=================================================================== ---- libtool-2.4.7.orig/m4/libtool.m4 -+++ libtool-2.4.7/m4/libtool.m4 -@@ -1254,16 +1254,20 @@ dnl lt_sysroot will always be passed unq +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 dnl in case the user passed a directory name. lt_sysroot= case $with_libtool_sysroot in #( - yes) + no) if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ # Treat "/" the same a an unset sysroot. -+ if test "$lt_sysroot" = /; then -+ lt_sysroot= -+ fi + # 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 ;; #( + yes|''|/) From patchwork Wed Jan 17 13:08:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 37969 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 F1C7FC47258 for ; Wed, 17 Jan 2024 13:08:38 +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.1534.1705496908911508500 for ; Wed, 17 Jan 2024 05:08:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=JyaOf9bO; 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-40e72a567eeso34514095e9.0 for ; Wed, 17 Jan 2024 05:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1705496907; x=1706101707; 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=XLrlJo2RRLTW4OF9UL5muzFYct9HCmyO4H5wQ/NiWR4=; b=JyaOf9bOMpzEdEvehQ8hnMyBbuNTVojvFG/Gvfi2LhFZ5c9ceifLLvJhgIMm8SSYoa BWpL4D45QqQB/Nl9u9jZxHty78+Otx2/XKYAWKR7JGrEx7wI3eWvk4E4LBZtLNw4+I7I 46C7TxjCQLTQOaV3e0HA2/3oPGEaMq5ryke70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705496907; x=1706101707; 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=XLrlJo2RRLTW4OF9UL5muzFYct9HCmyO4H5wQ/NiWR4=; b=kjGzY2E78wtXGVjJdSFRNNnSOzcXcP4K0ehHuAJ73oBM/L1biGBrD5/8SGsP0teE+G TxBtKxfRxJZvkIw+XYuRQ0dl24fhMArnyQCZGAm4fd/Het+bdWd20cE8zwaDsxCs5FH0 9h1fjPGMB5ePwp42fWziCIdPrOBpZ79lw0PzcZMZeKoOwo7caJd3cuzSaDBUFwVku0/W OXhgxMVVeQDyKBZmueMQ9yEInQgagWLneKDQUSi+L2yX+LqOWukuvHiwZDa9Pb5U/90t YREZrDbgLrsLKo02o+eozIN508ePZM8vSVQfOIoUQ3E7VRiLUhaF1J5bzoelpSVPlM4J yD1Q== X-Gm-Message-State: AOJu0YxLG0mFrdI8VM+Gwojhoz0ofCy0c2MldWbfdVgMdJSjBDT84NAh gQyPLTUM7mUjzBkCMcMAD09m9RI8q5LIggl5gpqH5Ev3pBQ= X-Google-Smtp-Source: AGHT+IEyvt/jJZrTenXpWAyNlln54SV5gEsfZiNPuDf+bKInULRPIt3mPIon7ZtL9xBiP43NQXUf9g== X-Received: by 2002:a05:600c:1d06:b0:40d:6293:fc69 with SMTP id l6-20020a05600c1d0600b0040d6293fc69mr2729475wms.28.1705496906909; Wed, 17 Jan 2024 05:08:26 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:3c1d:bf3d:325f:7bb3]) by smtp.gmail.com with ESMTPSA id k20-20020a05600c1c9400b0040e54f15d3dsm26263349wms.31.2024.01.17.05.08.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 05:08:26 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/5] libtool: Update patch offsets Date: Wed, 17 Jan 2024 13:08:22 +0000 Message-Id: <20240117130822.3928928-5-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240117130822.3928928-1-richard.purdie@linuxfoundation.org> References: <20240117130822.3928928-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 ; Wed, 17 Jan 2024 13:08:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193912 Our patches were rather out of sync, update the line offsets to match the current patchset/underlying code. Signed-off-by: Richard Purdie --- ...-trailing-slashes-on-install-command.patch | 4 ++-- ...e-the-with-sysroot-option-to-avoid-c.patch | 19 ++++++++++--------- ...-Add-missing-sysroot-to-library-path.patch | 4 ++-- ...sroot-paths-being-encoded-into-RPATH.patch | 8 ++++---- ...encode-RATHS-which-match-default-lin.patch | 8 ++++---- ...r-static-libs-for-internal-compiler-.patch | 4 ++-- ...-sure-autoheader-run-before-autoconf.patch | 2 +- ...-sure-autoheader-run-before-automake.patch | 2 +- ...eproducibility-stop-encoding-hostnam.patch | 4 ++-- .../libtool/dont-depend-on-help2man.patch | 3 ++- 10 files changed, 30 insertions(+), 28 deletions(-) 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 4c4d0547a36..51c0c52da8f 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 @@ -15,10 +15,10 @@ 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 96b37003..3d5dcd0a 100644 +index a5f21a1..f884824 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -2378,8 +2378,14 @@ func_mode_install () +@@ -2381,8 +2381,14 @@ func_mode_install () func_append dir "$objdir" if test -n "$relink_command"; then 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 1920e2e6dbf..2126f829537 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 @@ -84,9 +84,10 @@ Index: libtool-2.4.7/tests/sysroot.at AC_OUTPUT(Makefile) ]]) diff --git a/tests/testsuite b/tests/testsuite +index 24265e4..d388e3e 100755 --- a/tests/testsuite +++ b/tests/testsuite -@@ -48945,7 +48945,7 @@ $at_traceon; } +@@ -48997,7 +48997,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -95,7 +96,7 @@ diff --git a/tests/testsuite b/tests/testsuite #??? if test PATH = "$shlibpath_var"; then -@@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -104,7 +105,7 @@ diff --git a/tests/testsuite b/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -113,7 +114,7 @@ diff --git a/tests/testsuite b/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -49694,7 +49694,7 @@ $at_traceon; } +@@ -49761,7 +49761,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -122,7 +123,7 @@ diff --git a/tests/testsuite b/tests/testsuite #??? if test PATH = "$shlibpath_var"; then -@@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -131,7 +132,7 @@ diff --git a/tests/testsuite b/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -140,7 +141,7 @@ diff --git a/tests/testsuite b/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50443,7 +50443,7 @@ $at_traceon; } +@@ -50525,7 +50525,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -149,7 +150,7 @@ diff --git a/tests/testsuite b/tests/testsuite #??? if test PATH = "$shlibpath_var"; then -@@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -158,7 +159,7 @@ diff --git a/tests/testsuite b/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT 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 07c7f911e08..35f48ef906a 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 @@ -11,10 +11,10 @@ Signed-off-by: Richard Purdie Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 3d5dcd0a..2c994612 100644 +index f884824..25a91de 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -6475,7 +6475,7 @@ func_mode_link () +@@ -6503,7 +6503,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it. 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 4fcf456b0b8..9203302182d 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 @@ -10,10 +10,10 @@ 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 2c994612..96238350 100644 +index 25a91de..40cb94a 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -7654,9 +7654,11 @@ EOF +@@ -7682,9 +7682,11 @@ EOF 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 2c994612..96238350 100644 if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir else -@@ -8386,6 +8388,10 @@ EOF +@@ -8414,6 +8416,10 @@ EOF hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -38,7 +38,7 @@ index 2c994612..96238350 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir -@@ -8437,6 +8443,10 @@ EOF +@@ -8465,6 +8471,10 @@ EOF hardcode_libdirs= for libdir in $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then 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 589a33e8a66..8b6352b01b4 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 @@ -13,10 +13,10 @@ 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 96238350..6fb58ed2 100644 +index 40cb94a..2fa055e 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -7672,8 +7672,16 @@ EOF +@@ -7700,8 +7700,16 @@ EOF esac fi else @@ -35,7 +35,7 @@ index 96238350..6fb58ed2 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8406,8 +8414,16 @@ EOF +@@ -8434,8 +8442,16 @@ EOF esac fi else @@ -54,7 +54,7 @@ index 96238350..6fb58ed2 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8461,8 +8477,14 @@ EOF +@@ -8489,8 +8505,14 @@ EOF esac fi else 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 83c74373ae0..c151c3b4813 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 @@ -16,10 +16,10 @@ 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 180dd9d1..022c1292 100644 +index bd90775..3794130 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 -@@ -7560,7 +7560,7 @@ if AC_TRY_EVAL(ac_compile); then +@@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then for p in `eval "$output_verbose_link_cmd"`; do case $prev$p in 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 index 1543ad2afd5..f51deecbef2 100644 --- 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 @@ -14,7 +14,7 @@ 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 6b546092..84795d87 100644 +index c29860e..9c34bfd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) 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 index 67bd27ac928..e451de59e33 100644 --- 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 @@ -16,7 +16,7 @@ Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/ Signed-off-by: Mingli Yu diff --git a/Makefile.am b/Makefile.am -index 84795d87..8c9949ed 100644 +index 9c34bfd..231ef3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ 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 index b0f771c9bbc..8469b8727e1 100644 --- 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 @@ -13,10 +13,10 @@ https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ 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 022c1292..1a8a2998 100644 +index 3794130..84a550c 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 -@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ +@@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch index fd4084c8594..0013d165445 100644 --- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch @@ -4,9 +4,10 @@ Signed-off-by: Marko Lindqvist Updated by: Robert Yang diff --git a/Makefile.am b/Makefile.am +index 7bd7f72..c29860e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi) +@@ -411,21 +411,6 @@ $(notes_txt): $(notes_texi) $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'