From patchwork Wed Mar 9 06:47:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 4977 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 2BFF2C433F5 for ; Wed, 9 Mar 2022 06:48:04 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.3031.1646808482799812994 for ; Tue, 08 Mar 2022 22:48:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=b0gLe9LN; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id n2so1162753plf.4 for ; Tue, 08 Mar 2022 22:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S5LgpcCl3/ysmBzRnqvtglmKf/Iz+mkryTpMAQYjsC0=; b=b0gLe9LNXQ3tYpR3H217Wjx8PhrbuHhafD2AfOBPUcRIzm1IA0+8H/RIbcfghIt+En c3o/nQw5lT5mst0s+gJz3XgoBatWwaIg6y0o5JZnGCjiHA7LC0vdrELzWIr1CkIx96su UU3j6JV/66Ja7Uce26Zqm9l4v77GmMbru9eMazNn49xUcYwzFhotgYnQeObdNOmllKcP 1c9tAGgQgHhbgy32OgpMKzwizd4Oc++y5n0huJlGiX9BdlhJgVqgRwJpCpLwStxCtY7l ESrFCX67f+ehj7vSfxfxa5pnY7IDeUfgGhvD18aQKlfn/knzDRKBV7ba/H7qrffMDSQ2 AtmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S5LgpcCl3/ysmBzRnqvtglmKf/Iz+mkryTpMAQYjsC0=; b=aAv/mH/dagxBezDjcJBn10vSd1Fooink6ErF55eQifMYrNoGeQ1o4/2OB1FZOF+zN5 2xaFeqWweEoW6k4A5jj7XdVW7p3BvRSxCOPAExt9HH4lQIAea5uF50HnmRyCiCJcUciH VraBMcXuhfvEb5ieddKC/RvOdS5E7W6uuXooWcUdLQuetzwzTfUMnHtJO6YhFgSYbsvD l08No7wFOWLpG+iVTPgx1T+Kcb2nshx6gA2WgUmWj8+7qYSxRMlefHBTChhOxaIZbWfa lCwOFfhnr/X0bDgepujlzwT7y3oz97ihDapyYiE1qS543VQtwyDGK8HUQYiB9PB9r1Du lK2g== X-Gm-Message-State: AOAM531Z0+8KJy9b9WDg30Z4fKdeunEazutrMMEsOXavWoGF2o5qOSI9 W9p+G+t+j/9JDkNxhg16/eY4FtaEyqAqsw== X-Google-Smtp-Source: ABdhPJxG+JuW8/twhN6oVmfMK+XpcWjRYMEHF8MwfU5UeU5ZkN31dT7p/PLBuEHtS9P58dJFyH2qVg== X-Received: by 2002:a17:90b:1812:b0:1bf:2395:8d53 with SMTP id lw18-20020a17090b181200b001bf23958d53mr8730525pjb.178.1646808481587; Tue, 08 Mar 2022 22:48:01 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::ff3d]) by smtp.gmail.com with ESMTPSA id h10-20020a62830a000000b004f73c34f2e8sm1237053pfe.165.2022.03.08.22.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 22:48:01 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/2] zlib: Pass ldflags to configure tests using linking Date: Tue, 8 Mar 2022 22:47:57 -0800 Message-Id: <20220309064758.1716951-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.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 ; Wed, 09 Mar 2022 06:48:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162949 Signed-off-by: Khem Raj --- ...configure-Pass-LDFLAGS-to-link-tests.patch | 79 +++++++++++++++++++ meta/recipes-core/zlib/zlib_1.2.11.bb | 1 + 2 files changed, 80 insertions(+) create mode 100644 meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch diff --git a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch new file mode 100644 index 00000000000..91a1b4a09a1 --- /dev/null +++ b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch @@ -0,0 +1,79 @@ +From 001971eef84485562f912d8edd4fc7688acfad91 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Mar 2022 22:38:47 -0800 +Subject: [PATCH] configure: Pass LDFLAGS to link tests + +LDFLAGS can contain critical flags without which linking wont succeed +therefore ensure that all configure tests involving link time checks are +using LDFLAGS on compiler commandline along with CFLAGS to ensure the +tests perform correctly. Without this some tests may fail resulting in +wrong confgure result, ending in miscompiling the package + +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] + +Signed-off-by: Khem Raj +--- + configure | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index e974d1f..69dfa3f 100755 +--- a/configure ++++ b/configure +@@ -410,7 +410,7 @@ if test $shared -eq 1; then + echo Checking for shared library support... | tee -a configure.log + # we must test in two steps (cc then ld), required at least on SunOS 4.x + if try $CC -w -c $SFLAGS $test.c && +- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then ++ try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then + echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log + elif test -z "$old_cc" -a -z "$old_cflags"; then + echo No shared library support. | tee -a configure.log +@@ -492,7 +492,7 @@ int main(void) { + } + EOF + fi +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + sizet=`./$test` + echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log + else +@@ -530,7 +530,7 @@ int main(void) { + return 0; + } + EOF +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for fseeko... Yes." | tee -a configure.log + else + CFLAGS="${CFLAGS} -DNO_FSEEKO" +@@ -547,7 +547,7 @@ cat > $test.c < + int main() { return strlen(strerror(errno)); } + EOF +-if try $CC $CFLAGS -o $test $test.c; then ++if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for strerror... Yes." | tee -a configure.log + else + CFLAGS="${CFLAGS} -DNO_STRERROR" +@@ -654,7 +654,7 @@ int main() + return (mytest("Hello%d\n", 1)); + } + EOF +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log + + echo >> configure.log +@@ -744,7 +744,7 @@ int main() + } + EOF + +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log + + echo >> configure.log +-- +2.35.1 + diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index 1c06aa0ab5e..d699719554e 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef6 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://ldflags-tests.patch \ + file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ file://run-ptest \ " UPSTREAM_CHECK_URI = "http://zlib.net/" From patchwork Wed Mar 9 06:47:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 4978 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 299C6C433EF for ; Wed, 9 Mar 2022 06:48:04 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web12.3066.1646808483142510102 for ; Tue, 08 Mar 2022 22:48:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SpROoQ+3; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id fs4-20020a17090af28400b001bf5624c0aaso1511016pjb.0 for ; Tue, 08 Mar 2022 22:48:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lvCdLxTfj2Ucgpt3sap5jon0q0NDWTAUrbibFfmUE8Q=; b=SpROoQ+3ZVNAmiYGBCHS2FRIVyYvDAHE+80bXMWUe1uu7pOKg3jNfTfKrHj//HXRDa IFLfWbiFYwAbzYEBz7biV2dI62LiejKNy27/LS4VgdlXmXcuAs6H+2OSCq02PyxWAGGk j8s/zUhg29jDjlPwxi4C+e+UCczx5hZnj/rwObhu+2Y2vOBrRyQoDz+BMTJamlonWIG9 o+Q6nJYknkSoWTb61DWjVGD6rmHrX7E25qcmPIGeamX2LwnqDq2O41l6OjtM1YVavO2Z ZE+mtmzsr0i99W8xECsuqOtGjpDOuSVod9mO5uhW+q2PYzNLrsVdLm8l7/RPPoUePJ7E l/vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lvCdLxTfj2Ucgpt3sap5jon0q0NDWTAUrbibFfmUE8Q=; b=DI69XHtG2TfXoX8ezQXmjpu3EDWvQ8lfwvq4G8exiZUSOj2T1+6u1akWDK8fPcb0VD 0BhQk35+GddjcFPUeE08Lp49SMbMy/jTqGo66aCtvu5G9ICgjE5S6DiLZtVW9Jvgety/ lQfD8mMjCw4n+ebXxuWzyvniSIE6/112WvI4iIyDSzcv7bWKbblTcqDOdA8jz25cSLxx cIuBOBtJQT5sM2OoyKm46DyP7EHPM9+nQLBxVV5uGw8maHE4ptjxISKkFdwrznjL8RSW SqgaeC2w6LjVXwJwuEcQgaUhsen7XZHlE3LZSY2S9XfcSb5np/PNRnEzxElyNWAFixfw GQLg== X-Gm-Message-State: AOAM530UwN6tjw5ncHp05tW3ldbv/Z5pcBypmRub31G7pQZUsKsVD4k3 xjdenmwV6sZOc3WlFzg2j20cQYjCn6h8yA== X-Google-Smtp-Source: ABdhPJz/SBQCDY3UvX1y7+WyZVziiiU2VEaBfssn3Pc7EDy8JrlbbHMCoG8zSGimPsIdANs/76A+lQ== X-Received: by 2002:a17:902:6b4a:b0:14d:474f:4904 with SMTP id g10-20020a1709026b4a00b0014d474f4904mr21424796plt.122.1646808482261; Tue, 08 Mar 2022 22:48:02 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::ff3d]) by smtp.gmail.com with ESMTPSA id h10-20020a62830a000000b004f73c34f2e8sm1237053pfe.165.2022.03.08.22.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 22:48:01 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/2] zip: Pass ldflags to configure tests using linking Date: Tue, 8 Mar 2022 22:47:58 -0800 Message-Id: <20220309064758.1716951-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309064758.1716951-1-raj.khem@gmail.com> References: <20220309064758.1716951-1-raj.khem@gmail.com> 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, 09 Mar 2022 06:48:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162950 Signed-off-by: Khem Raj --- ...LAGS-and-LDFLAGS-when-doing-link-tes.patch | 88 +++++++++++++++++++ meta/recipes-extended/zip/zip_3.0.bb | 1 + 2 files changed, 89 insertions(+) create mode 100644 meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch new file mode 100644 index 00000000000..475a653f287 --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch @@ -0,0 +1,88 @@ +From ab5df4826c4a532da78828b72a2751c899e27ef2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Mar 2022 22:31:21 -0800 +Subject: [PATCH] configure: Use CFLAGS and LDFLAGS when doing link tests + +Some case link flags contain important flags which are required during +linking, link fails otherwise without them, which can result in +configure detection go wrong, ensure these flags are used along with CC +when tests involve linking + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + unix/configure | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 1bc698b..1d9a9bb 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -517,14 +517,14 @@ for func in rmdir strchr strrchr rename mktemp mktime mkstemp + do + echo Check for $func + echo "int main(){ $func(); return 0; }" > conftest.c +- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" + done + + + echo Check for memset + echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + + +@@ -533,7 +533,7 @@ cat > conftest.c << _EOF_ + #include + int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; } + _EOF_ +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE" + + +@@ -542,7 +542,7 @@ cat > conftest.c << _EOF_ + #include + int main() { strerror( 0); return 0; } + _EOF_ +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR" + + echo Check for errno declaration +@@ -563,7 +563,7 @@ cat > conftest.c << _EOF_ + int main() { return closedir(opendir(".")); } + _EOF_ + +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + OPT="" + for lib in ndir dir ucb bsd BSD PW x dirent +@@ -583,9 +583,9 @@ fi + + echo Check for readlink + echo "int main(){ return readlink(); }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lseq >/dev/null 2>/dev/null + [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq" + fi + +@@ -661,7 +661,7 @@ elif [ -f /xenix ]; then + elif uname -X >/dev/null 2>/dev/null; then + # SCO shared library check + echo "int main() { return 0;}" > conftest.c +- $CC -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null + [ $? -eq 0 ] && LFLAGS2="-lc_s -nointl" + else + SYSTEM=`uname -s 2>/dev/null` || SYSTEM="unknown" +-- +2.35.1 + diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 0547cd5c53a..07a67b96348 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://zipnote-crashes-with-segfault.patch \ file://0001-configure-use-correct-CPP.patch \ file://0002-configure-support-PIC-code-build.patch \ + file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ " UPSTREAM_VERSION_UNKNOWN = "1"