From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 10 01:57:10 2021 Received: (at submit) by debbugs.gnu.org; 10 Nov 2021 06:57:10 +0000 Received: from localhost ([127.0.0.1]:36828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkhXi-0001IE-8N for submit@debbugs.gnu.org; Wed, 10 Nov 2021 01:57:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:33228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkhXf-0001I6-Uf for submit@debbugs.gnu.org; Wed, 10 Nov 2021 01:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkhXf-0002Ut-Mi for guix-patches@gnu.org; Wed, 10 Nov 2021 01:57:07 -0500 Received: from [2a00:1450:4864:20::231] (port=46040 helo=mail-lj1-x231.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkhXa-0002s7-1b for guix-patches@gnu.org; Wed, 10 Nov 2021 01:57:05 -0500 Received: by mail-lj1-x231.google.com with SMTP id u25so622628ljo.12 for ; Tue, 09 Nov 2021 22:57:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=u6rQfvcOatJ6C8ii+YRoIGBLbTF8DTuumLYR8cqO83c=; b=Ox39HJuIT9JEEyXs5a6a5A6jX4t3yrY0R+63WekKXRFR8eNgiGfqnyEnnipdb20o/5 tA9arTDhG4g1nKw4e4e8r7gAPT3KOTy28zhTchmY5hdOTrla+LBXkZD+yQi2Xr65fo2W Y9T/341WDzQir2EwlTb2Dra7cffu2bgV6D16OZAUBdrqufKFr60w63CHLWy9vREHz/0d TTtiyFXqDwklyKxywoLUjrv6uL58RWEkeOpj7MqQ6jrubVQ1k9DPQucXcU0B5YEVX8M8 ThZB9msP8LE+ej4ZntgTfq4Y9yRIGuWDpoVqWnaAFp9woqfS0gUGzzLbfyuDBQ9vVU3f Csqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=u6rQfvcOatJ6C8ii+YRoIGBLbTF8DTuumLYR8cqO83c=; b=asdSpor0VKIelhgFluIhbZ7aov7GhaJCg9TxH5oDEliY67vPoNT+1Jx89o2RL6OmQl wIoLJwZZ1o6pnEBbG2SqHr7mPGHvqPfc8p1TzBFWcC4W3crS0i1DQ46l9sbzAZVKqlt8 3vd6wgOjTUI3oH1o7hm5pYjIjCCiEtkVuNsDIzQw5COAc6EqCT3cvWyMWOiJjQJOIohA 6NqGNnqpMaE0w2Cc1JVwOCY+4RquwONZV+ODG4GbScIa0G5Ck1PMl8hUMPPwHUXRf9x1 fhGE6nhXIEAfTW4yrxuM96N4e11fReo99kXb6Por+cE2St373I2D0ezGgyxsPrR3lU7P /3iQ== X-Gm-Message-State: AOAM532wF4TC0gVNDFdZ2QleUu/sRbChhz0AkPgLdA9BucIaCsTiESGr EQiVJcYVGYN5/57OL/Tx+HyxOQ8F2IZg/khMv2s2P5zvDPbXZQ== X-Google-Smtp-Source: ABdhPJwDRVC1rXzoz5HThQZEbRLsE9G8o3znL8C5+7+qbzAvJxyPk/AGc7rP+hnfKbsj6hlxEamFKozuzRimzmyYiOU= X-Received: by 2002:a05:6000:1564:: with SMTP id 4mr17118034wrz.9.1636526963966; Tue, 09 Nov 2021 22:49:23 -0800 (PST) MIME-Version: 1.0 From: Michael Ford Date: Wed, 10 Nov 2021 14:49:13 +0800 Message-ID: Subject: [PATCH] cross-base: fix environment variables patch for GCC 10 To: guix-patches@gnu.org Content-Type: multipart/alternative; boundary="0000000000005a471605d069a045" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::231 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=fanquake@gmail.com; helo=mail-lj1-x231.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --0000000000005a471605d069a045 Content-Type: text/plain; charset="UTF-8" --- gnu/packages/cross-base.scm | 2 + .../gcc-10-cross-environment-variables.patch | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/patches/gcc-10-cross-environment-variables.patch diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 180594509b..0a93d0dc6d 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -243,6 +243,8 @@ (define* (cross-gcc target (append (origin-patches (package-source xgcc)) (append (cond + ((version>=? (package-version xgcc) "10.0") + (search-patches "gcc-10-cross-environment-variables.patch")) ((version>=? (package-version xgcc) "8.0") (search-patches "gcc-8-cross-environment-variables.patch")) ((version>=? (package-version xgcc) "6.0") diff --git a/gnu/packages/patches/gcc-10-cross-environment-variables.patch b/gnu/packages/patches/gcc-10-cross-environment-variables.patch new file mode 100644 index 0000000000..829bc583e9 --- /dev/null +++ b/gnu/packages/patches/gcc-10-cross-environment-variables.patch @@ -0,0 +1,54 @@ +Search path environment variables for cross-compilers. See the discussion +at . + +Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed +at . + +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f790db0daf..326aa52f46f 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -4474,7 +4474,7 @@ process_command (unsigned int decoded_options_count, + } + + temp = env.get (LIBRARY_PATH_ENV); +- if (temp && *cross_compile == '0') ++ if (temp) + { + const char *startp, *endp; + char *nstore = (char *) alloca (strlen (temp) + 3); +diff --git a/gcc/incpath.c b/gcc/incpath.c +index 8a2bda00f80..4f740a6a4c3 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -472,8 +472,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + int stdinc, int cxx_stdinc, int verbose) + { + static const char *const lang_env_vars[] = +- { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", +- "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" }; ++ { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH", ++ "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" }; + cpp_options *cpp_opts = cpp_get_options (pfile); + size_t idx = (cpp_opts->objc ? 2: 0); + +@@ -484,7 +484,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + + /* CPATH and language-dependent environment variables may add to the + include chain. */ +- add_env_var_paths ("CPATH", INC_BRACKET); ++ add_env_var_paths ("CROSS_CPATH", INC_BRACKET); + add_env_var_paths (lang_env_vars[idx], INC_SYSTEM); + + target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); +diff --git a/gcc/system.h b/gcc/system.h +index 263070169ab..14a819db28d 100644 +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -1248,4 +1248,6 @@ void gcc_stablesort (void *, size_t, size_t, + of the number. */ + #define PRsa(n) "%" #n PRIu64 "%c" + ++#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" ++ + #endif /* ! GCC_SYSTEM_H */ -- 2.33.1 --0000000000005a471605d069a045 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
---
=C2=A0gnu/packages/cross-base.scm =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A02 +
=C2=A0.../gcc-= 10-cross-environment-variables.patch =C2=A0| 54 +++++++++++++++++++
=C2= =A02 files changed, 56 insertions(+)
=C2=A0create mode 100644 gnu/packag= es/patches/gcc-10-cross-environment-variables.patch

diff --git a/gnu= /packages/cross-base.scm b/gnu/packages/cross-base.scm
index 180594509b.= .0a93d0dc6d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packag= es/cross-base.scm
@@ -243,6 +243,8 @@ (define* (cross-gcc target
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(append
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (origin-patches (package-source xgcc))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 (append (cond
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0((version>=3D? (package-version xgcc) "10.0")
= + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sea= rch-patches "gcc-10-cross-environment-variables.patch"))
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((version= >=3D? (package-version xgcc) "8.0")
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (search-patches "gcc-= 8-cross-environment-variables.patch"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((version>=3D? (package-version= xgcc) "6.0")
diff --git a/gnu/packages/patches/gcc-10-cross-e= nvironment-variables.patch b/gnu/packages/patches/gcc-10-cross-environment-= variables.patch
new file mode 100644
index 0000000000..829bc583e9
= --- /dev/null
+++ b/gnu/packages/patches/gcc-10-cross-environment-variab= les.patch
@@ -0,0 +1,54 @@
+Search path environment variables for cro= ss-compilers.=C2=A0 See the discussion
+at <http://gcc.gnu.org/ml/gcc/2013-02/msg001= 24.html>.
+
+Note: Touch 'C_INCLUDE_PATH' et al. rathe= r than 'CPATH', as discussed
+at <http://bugs.gnu.org/22186>.
+
+diff --git a/gcc/gcc= .c b/gcc/gcc.c
+index 9f790db0daf..326aa52f46f 100644
+--- a/gcc/gcc.= c
++++ b/gcc/gcc.c
+@@ -4474,7 +4474,7 @@ process_command (unsigned i= nt decoded_options_count,
+ =C2=A0 =C2=A0 }
+
+ =C2=A0 temp =3D e= nv.get (LIBRARY_PATH_ENV);
+- =C2=A0if (temp && *cross_compile = =3D=3D '0')
++ =C2=A0if (temp)
+ =C2=A0 =C2=A0 {
+ =C2=A0 = =C2=A0 =C2=A0 const char *startp, *endp;
+ =C2=A0 =C2=A0 =C2=A0 char *ns= tore =3D (char *) alloca (strlen (temp) + 3);
+diff --git a/gcc/incpath.= c b/gcc/incpath.c
+index 8a2bda00f80..4f740a6a4c3 100644
+--- a/gcc/i= ncpath.c
++++ b/gcc/incpath.c
+@@ -472,8 +472,8 @@ register_include_c= hains (cpp_reader *pfile, const char *sysroot,
+ int stdinc, int cxx= _stdinc, int verbose)
+ {
+ =C2=A0 static const char *const lang_env_= vars[] =3D
+- =C2=A0 =C2=A0{ "C_INCLUDE_PATH", "CPLUS_INC= LUDE_PATH",
+- =C2=A0 =C2=A0 =C2=A0"OBJC_INCLUDE_PATH", &= quot;OBJCPLUS_INCLUDE_PATH" };
++ =C2=A0 =C2=A0{ "CROSS_C_INCL= UDE_PATH", "CROSS_CPLUS_INCLUDE_PATH",
++ =C2=A0 =C2=A0 = =C2=A0"CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PAT= H" };
+ =C2=A0 cpp_options *cpp_opts =3D cpp_get_options (pfile);+ =C2=A0 size_t idx =3D (cpp_opts->objc ? 2: 0);
+
+@@ -484,7 += 484,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot,+
+ =C2=A0 /* CPATH and language-dependent environment variables may = add to the
+ =C2=A0 =C2=A0 =C2=A0include chain. =C2=A0*/
+- =C2=A0add= _env_var_paths ("CPATH", INC_BRACKET);
++ =C2=A0add_env_var_pa= ths ("CROSS_CPATH", INC_BRACKET);
+ =C2=A0 add_env_var_paths (= lang_env_vars[idx], INC_SYSTEM);
+
+ =C2=A0 target_c_incpath.extra_p= re_includes (sysroot, iprefix, stdinc);
+diff --git a/gcc/system.h b/gcc= /system.h
+index 263070169ab..14a819db28d 100644
+--- a/gcc/system.h<= br>++++ b/gcc/system.h
+@@ -1248,4 +1248,6 @@ void gcc_stablesort (void = *, size_t, size_t,
+ =C2=A0 =C2=A0of the number. =C2=A0*/
+ #define P= Rsa(n) "%" #n PRIu64 "%c"
+
++#define LIBRARY_PA= TH_ENV "CROSS_LIBRARY_PATH"
++
+ #endif /* ! GCC_SYSTEM_H *= /
--
2.33.1

--0000000000005a471605d069a045-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 10 23:54:47 2021 Received: (at 51743) by debbugs.gnu.org; 11 Nov 2021 04:54:48 +0000 Received: from localhost ([127.0.0.1]:39798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ml26p-0007Jl-HO for submit@debbugs.gnu.org; Wed, 10 Nov 2021 23:54:47 -0500 Received: from mail-dm6nam10olkn2030.outbound.protection.outlook.com ([40.92.41.30]:30816 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ml26l-0007JU-O0 for 51743@debbugs.gnu.org; Wed, 10 Nov 2021 23:54:46 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fRuiqF+IgZPjSNdwl7D/5zWDZLwxP/mIt8P0Vl/wjhPaaC58qD8DJLJTL70n70uw634NBWV7zwS7Gv4+3Vjs/lbmxwXgj2coeq0LiGZc3dtx4LRhlmpaN7t9AyP2XPhyB17MEIYuL5bjFTJVnsNayd4SPMOXZLmeCY0vnnLUtB4TCXb5CKhc+7yoCFWM/2QIYyGn2ef9N4Po0QZ9iUag2u2uICU713N5dgWo0ShiiS4OvPD5KlR7uoAQ/08+Kct6Ey1ljnd+bqFnEAvXCcMQR8/sXHHOMQka3DYzMaF2emi+JTEunhsj7MSm8pqtN1CvCYh/ADDoyXq0zJB0UANlwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4GM5Iy/v0Iyy4ER3RwZzTIR2LwF5VYJgOy/phLhQGs4=; b=SyZaaNzmgs/G8iHmUibEI2frrZGuO9TC3qZCKosJeu0y2vMvOclGLgeaDP2yT3qjnDyb3ENXVsJX+kx1fwHiOc9eWn6YMXm0Dsi/D4j+AZDNz4xchjWBqB6lzZTxacC2UGMu/gFf+I1vzoiQA5LlQSIi75j5X/qvIru63jAbsvlaLX8No8FhpnVSM55kq5rmrkU16XT0H0qHphLDW0Qu/gISzUUo4O82XGspiSxYOq2QYrKmdwKMl2uEO5wHbupGE2coV/mp+lyGpXE7cc9jZRL9MHJIDhEXn6HJ7RQknhSogSq8WWNGfO4i8ydEhphUH53CylA2vyWhOkXkxGwoBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4GM5Iy/v0Iyy4ER3RwZzTIR2LwF5VYJgOy/phLhQGs4=; b=tgap8nXNttV37VRRnNBq7yWxK8YI1tgobHkMPCKfoHF0lEODF/ZHT0mhc6aHvnf0rXllfp8R8/wP7vPca9qOUnABntYCYnRBI1ic8crhgHAukDuHeXKgtIQvKQJsKxj60N/B2+YB9j5eHuDLUY85PSzIe0JOyOUhw8Gz1S2FgWCGu2kCOrIihSfmo8Ga/zqww8B0m/PnacSCqHOILgWCwu84hNB+bo+CkfyMJ/PEr9yG67bqq9d+uzy7GwmPPz40B/Xj+g0NpufVbWJ40o5+Sqw2jQLf84/UHumVq00UhfU2De5smdxjCMXxMm0nXUGvjNC7rd7qpDSgSwvPdK0ccA== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB6326.namprd05.prod.outlook.com (2603:10b6:a03:e1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.12; Thu, 11 Nov 2021 04:54:36 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4690.020; Thu, 11 Nov 2021 04:54:36 +0000 From: Morgan.J.Smith@outlook.com To: 51743@debbugs.gnu.org, fanquake@gmail.com Subject: [PATCH] cross-base: fix environment variables patch for GCC 10 Date: Wed, 10 Nov 2021 23:50:55 -0500 Message-ID: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [AT47xpq2hZ/0AmlwQ31EfldGOQkLZWmJ] X-ClientProxiedBy: YQBPR0101CA0066.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::43) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211111045054.27097-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (170.52.80.188) by YQBPR0101CA0066.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:1::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15 via Frontend Transport; Thu, 11 Nov 2021 04:54:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e710621-ded8-47e0-495b-08d9a4cf5543 X-MS-TrafficTypeDiagnostic: BYAPR05MB6326: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3+zxK++ukzUCumbvmaA+qUCKQLL8390swRlz9R6699ZaLba0WCOQOddZMXseAn+uFCTizRGOe/2o/wD8tlX9TNtN71dD0+XI0ykic+VxE2X4CHsJufr4jXJoLAOyqerF4uRNq0qRYajJuVEZeWgl25p9ReJSIjZ0x+llhK/ju5Cw5GLxFUsSIq1IOabXQyxh03ly6C/0TfSM+Q7JI7ID04lHBz4NcDy7xmWotS/r+Lj5iyIoyI15kcrOiqqgCrYZz6Aj12sitm/hXl4xoxTadSseCf18lMwwaNtLcJViAImSzgzgKVAM1AqOugQ/u6MzqItFQplrraSO2vEyLAz32WCT69YsnW2+kFTMdBsek8j+0YmcjjsI0eALubDr/WppmIyhT7OGgZannT3hCHLQUDFUB2WfPREW+x+jG3QiLi6wHgeqnHyLKal5ymkoIgQtkulgfR9s3ASK5ZQMwam34GG6UMIpYtr26K7Rnt5PKweQCknORBmhhyXGQ9wvGmrQSuCIXkLe0OtOyDa2AxfoUnSuijCAjEP3j0siuIb1WMrA9oWaSBpgBTSQND2ceCVwlkt4iEFDd6KhDHNRnkxB7A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qGR0mRb2EGfuoTn/Lpq/UdUZ4hGaG+y2UOwZDwgy+ePRLSglXsL8SHJc15ShUENgaH+3DNZyyKfCjlq3t4AEGMlnO1P3CK+pkXzwbkZ6s8n/a4D24S4HPG+LIsq+1Wh7oif6YQrdcxFV9NZM2LnYOaAqgyLxKAyWo0y59sSZryatuHsywT1WjD50ChWJJjV6U5LaA7mAfiTbhsZ8lU8o0dTbbS5Vr1f4GIoQp73u9ez1eUGyHjzWNf2KfkHKuReEXJAgLTD5g28PHq5eKLm+XHKZtzebEo+LD9g/nOwPM4iRMNrUDGbEUkE67b5Lpoo+K/Ol0x7LDPyKy1IoaHg0oos1oitieiFaG7fPKUQkUKKxvcGeexX4wLDoeAusghFjuHI7O93i8d+0/C7WNS1FDIVfAESQfjLbVLier2bL6hVQORosRaKVemGtNCjAeZ0dQJ5cF82EPyBPMFsL4/n7131FtZFP3r2sOO/USm6rIDZ4rg3vqIeZJohfSMUamv5cMwKtUiBHDjkGWrTsCVqMqpebvyrKLYrtXlezHmNArFOUD3naMqobSl7yKN87tf8LsbKdyxF6TpLQyEwJymAR3AUddEyFh3qn4Rlp3J/4u1+X3L0IY840YP3wVZDLKHZmF+BQIP4dbkgWNiG+VCMYl6KxVT94vCZptiGQ0+tDAeE8ZwE0y3QOrFayd88Ego/4HPlA8lNtJfRqG8Ew6JL8ug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e710621-ded8-47e0-495b-08d9a4cf5543 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2021 04:54:35.8979 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB6326 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51743 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Michael Ford This patch works great! I have an MSP430 toolchain based on GCC 11 I've been trying to get working and this fixes the environment variable problem. Thank you very much! I think the formating of the patch got messed up a little in transport so I'm re-sending it here to make it easy for the committer. --- gnu/packages/cross-base.scm | 2 + .../gcc-10-cross-environment-variables.patch | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/patches/gcc-10-cross-environment-variables.patch diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 180594509b..0a93d0dc6d 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -243,6 +243,8 @@ (define* (cross-gcc target (append (origin-patches (package-source xgcc)) (append (cond + ((version>=? (package-version xgcc) "10.0") + (search-patches "gcc-10-cross-environment-variables.patch")) ((version>=? (package-version xgcc) "8.0") (search-patches "gcc-8-cross-environment-variables.patch")) ((version>=? (package-version xgcc) "6.0") diff --git a/gnu/packages/patches/gcc-10-cross-environment-variables.patch b/gnu/packages/patches/gcc-10-cross-environment-variables.patch new file mode 100644 index 0000000000..c350e4b62b --- /dev/null +++ b/gnu/packages/patches/gcc-10-cross-environment-variables.patch @@ -0,0 +1,54 @@ +Search path environment variables for cross-compilers. See the discussion +at . + +Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed +at . + +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f790db0daf..326aa52f46f 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -4474,7 +4474,7 @@ process_command (unsigned int decoded_options_count, + } + + temp = env.get (LIBRARY_PATH_ENV); +- if (temp && *cross_compile == '0') ++ if (temp) + { + const char *startp, *endp; + char *nstore = (char *) alloca (strlen (temp) + 3); +diff --git a/gcc/incpath.c b/gcc/incpath.c +index 8a2bda00f80..4f740a6a4c3 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -472,8 +472,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + int stdinc, int cxx_stdinc, int verbose) + { + static const char *const lang_env_vars[] = +- { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", +- "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" }; ++ { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH", ++ "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" }; + cpp_options *cpp_opts = cpp_get_options (pfile); + size_t idx = (cpp_opts->objc ? 2: 0); + +@@ -484,7 +484,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + + /* CPATH and language-dependent environment variables may add to the + include chain. */ +- add_env_var_paths ("CPATH", INC_BRACKET); ++ add_env_var_paths ("CROSS_CPATH", INC_BRACKET); + add_env_var_paths (lang_env_vars[idx], INC_SYSTEM); + + target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); +diff --git a/gcc/system.h b/gcc/system.h +index 263070169ab..14a819db28d 100644 +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -1248,4 +1248,6 @@ void gcc_stablesort (void *, size_t, size_t, + of the number. */ + #define PRsa(n) "%" #n PRIu64 "%c" + ++#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" ++ + #endif /* ! GCC_SYSTEM_H */ -- 2.33.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 11:51:31 2021 Received: (at 51743) by debbugs.gnu.org; 1 Dec 2021 16:51:32 +0000 Received: from localhost ([127.0.0.1]:45447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msSpP-0000h6-M6 for submit@debbugs.gnu.org; Wed, 01 Dec 2021 11:51:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msSpN-0000gt-Sa for 51743@debbugs.gnu.org; Wed, 01 Dec 2021 11:51:30 -0500 Received: from [2001:470:142:3::e] (port=57546 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msSp8-0006Il-L8; Wed, 01 Dec 2021 11:51:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=EdJ/3lq9UFIQd/UsL2S/rgcvrDZQFfYeIaf33b5GL/w=; b=S3j+WOUsdB769uo3+KnY slHyEVd2kd7dnR9OCwY1IofKojCBQJDvIUxUhhKWCpCy0lCJoZ89uNhiN6vSBGjEQytjG3/01st/H YTj6lM0Anq47B45jXf957qz6LyG7xzOkTjxhQa5FSQjcRwbGoX3HFFZAs5QNwm1s2uLGvw62MggGS I1EuaUUxO1cU9oveCThEcqGrj3uD0H/gk6IibLHeugV1gG/jBoViANRJixyzqITHjhCE6nr0UH+BS j7Q20Q5JS98wg6lmDEe/Ur4M7j+KFcCUEUyNhla0Xa++FgbqpASsjjZCKcIbqRBO4GGwGu/6gPXIE DCiWK8DF19h/ig==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45588 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msSp8-0001UH-GG; Wed, 01 Dec 2021 11:51:14 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Michael Ford , Morgan.J.Smith@outlook.com Subject: Re: bug#51743: [PATCH] cross-base: fix environment variables patch for GCC 10 References: Date: Wed, 01 Dec 2021 17:51:12 +0100 In-Reply-To: (Michael Ford's message of "Wed, 10 Nov 2021 14:49:13 +0800") Message-ID: <875ys81d6n.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51743 Cc: 51743@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Michael and Morgan, Michael Ford skribis: > --- > gnu/packages/cross-base.scm | 2 + > .../gcc-10-cross-environment-variables.patch | 54 +++++++++++++++++++ > 2 files changed, 56 insertions(+) > create mode 100644 A similar patch was added in =E2=80=98core-updates=E2=80=99 commit 4796b5d6d18dcc0f1b6c8e134977ebdb575c5741, which we=E2=80=99ll hopefully be merged Real Soon Now. So I=E2=80=99m tempted to just wait for the merge. Thoughts? Thanks, Ludo=E2=80=99. PS: Please use =E2=80=98git send-email=E2=80=99 or send patches as attachme= nts to make sure they aren=E2=80=99t mangled on the way. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 30 02:59:17 2021 Received: (at control) by debbugs.gnu.org; 30 Dec 2021 07:59:18 +0000 Received: from localhost ([127.0.0.1]:51286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2qLF-0007RV-O4 for submit@debbugs.gnu.org; Thu, 30 Dec 2021 02:59:17 -0500 Received: from mail-mw2nam08olkn2022.outbound.protection.outlook.com ([40.92.46.22]:5058 helo=NAM04-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2qLC-0007RF-Eo for control@debbugs.gnu.org; Thu, 30 Dec 2021 02:59:17 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m1AWWODght7tL+WXubJyi+T2qqLPBdnIts46FSyiEDyafEBGWzlwjs5kYdMCG74R1EJ6tJqgx2EIpsQ269PKHRQYPgizQbLEDoUam9ncxdB+Sp3KtLn/+50fAljXJ90aAhWwbLJZyzy3BaHeISdnbyaHOV/pVIIpAV9cOUoKiYMuPsavghBiKmCj+CnAgGm/iBTiEHEUqwvuIul7vQmw6RqH/+/pwRLpdaML18QzRqbB09zERc7kFEfV5tbDKQ7lVS3ctV3vQ2c+0Or8ROcZMYYM1oznT159E1eTZaQqMEm1FwWtzcwmIfm3olLUm6Lf91JSg3cBhr/PkZL2V2+juA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aJcSeADKsdHp4xSqXNcKf3TG8P7lrBY9lZ97kZDrw+A=; b=JbByfUl0FDz+Vf41+gMOdBceJg2G2mZGmEKJr5Whrz4MKMmdtjm+FFYVgVljjhoJCFdxc38M05AjOgGh19e7fXOQ6zoF2TLa7Bt7CRuxbqtqffkx9E5X3XSI7nhFFYw7g774XH2/CJv48kMc+0M9A9TI+6NF+uEsRjx2ZOobb3Vmc7cqXOYDWCJ5zogjlyfCt+/rbjFnb0X7yTbgWvO+3pXCXDhQnBfT+xaaiaAfIdGioPPziwteodiLzEeIKD+mNMOSZVHMnhmmph43C4pEKhiXD+bvGegKDuf8v/1mhkWsOlwgpL00W7Pl8Hsqn3cy0m1XmRGpBs/ndXwmpzafaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aJcSeADKsdHp4xSqXNcKf3TG8P7lrBY9lZ97kZDrw+A=; b=tYutsq9oCHHhK30oqx022vb1s5AfDg0zhbz5jf/HmvopSm+wpUB5UOlftehkdH6jlW9oMoQQGGQ/coAWk2DDJgFfy8F/OqnpfFLSjFmsZVBjPhtv1xFH5S3XJhfKCpPbm+vAMSfI6Ln9EndZEpB4Qc4sQewdHPum9HCQaY8FblzJoouyFBKIUQQBQi61MmbEOvkpCvZiWPcBFYO8UvZldCG9PVFjd8HgYu3yXhfOCfWcXlNQVJAVe1SqimCIU2/1npUs/4p31cqQZ+e9xWgj024U2oIMmIJhNpLQ+A3CmItSGIlIZphahHp+6sYNdcFsYgBBWNr71aPHl6nrEA/ujg== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by CH2PR05MB6789.namprd05.prod.outlook.com (2603:10b6:610:10::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Thu, 30 Dec 2021 07:59:06 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca%6]) with mapi id 15.20.4844.014; Thu, 30 Dec 2021 07:59:06 +0000 From: Morgan Smith To: control@debbugs.gnu.org Subject: control message for bug #51743 Date: Thu, 30 Dec 2021 02:59:02 -0500 Message-ID: Content-Type: text/plain X-TMN: [kFOgKDIjQv60iMIInvPrU8Cr90G8Dwmb] X-ClientProxiedBy: YQBPR01CA0087.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::23) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <87lf02frqx.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a119ac4d-472a-4e1f-290c-08d9cb6a4078 X-MS-TrafficTypeDiagnostic: CH2PR05MB6789:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 18/Vnq/fQn4YVPpIBw+hOaNOwV+Y0QjcfScEcC0s0gBDGu7wv8Nlb17X9fTjE54bO53WtjT1UzevkR54l2dAreNL0+7EgTfz/tWn/cnHpa8dJRnkQqsyWx0gvvhz0UtaqMLgp58c/2RU7j1cXszkhHjeydk9lKAzOdi2+F57gXGJyz8jEp0covCbnzFiBnXVZxBvelXC4sSXmwCNg4uSSIvz/E6Td+iOpbQTzQ7rmmCVKdvQijH8likw9rt1nQyz/2FZFOlUGSagbyweIVRicJ+nztUC4RpXiO+pq/PBuZILvgLWDF2KEVEIPw/SQ5QobTAJ5OkZa8c8/HWBtfplTGlnGaEjOYvfCkI06ZDguL2yZCcn8ciGr9bpJEmjXto9wmWq15/Az89QPpx8IaPFgAc4L9osJvZiNm6aIJLYRDRf2LyiY341BzVaKUakUyEC+PcQQC3sstC+IY5h7sRCZHqg/jivc2ysb626I/eHB3gDxM3UHbpNENQa4UTGG1mzi9U/2rtTmy+w+4gCOH4lQAU7mCE3rIsy09QwDcAfmL5KnI4tJ79Pma90doN0b1t3ugyZQrvDsvvQYOZ2ByvCAg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xburGsh3DXRhDQggftUbYwQdOgX+kmqZqT7A1RNvKDGG7uY3SWuMj2xYjJoe?= =?us-ascii?Q?8O22LzSyqA9OxiKVT1b/L0Oqj2crH76nU/iRkzPWf4NLVW90h9YilZrSCDZV?= =?us-ascii?Q?3sSNhMsSt02Qs9IofY1M22ntaes6JE4crxS1U0AoaMmiC8YAKtlS6I7NvLKc?= =?us-ascii?Q?2gnQk/5Al0IRvkcet5viphzE5ImtjqbI7lG5/1PqzwJmiAO9yFc7Yo25ir8M?= =?us-ascii?Q?aGA9kv5Dn6J7rmiffrhCG+fcDA+Y5st3uzR9gekusb4ytS8Y27B4GDk8QlWe?= =?us-ascii?Q?0KEKkTuIwKx6ugFpFwJumYfYVzMBIhTTylE4tM6HMi/837gsA2ljdqkWZCzv?= =?us-ascii?Q?dcVXpkK0vXWqzHYCd6as1z6fwo1Oues/DsX5pVoGEBxEEkZaIWLjqj6EBk+R?= =?us-ascii?Q?Vv5vSwEsu7Eh63vTWl61bMkFthTAcUTDmUjrpPhbydUObrlann5rpHBffZYk?= =?us-ascii?Q?NlU/flIWuJ5kPzEnknQlSQp6RTm2JhCvzPTJMio8g1xQmPg8rkkQ9vKsdXLl?= =?us-ascii?Q?Ly5o7ZMyjQy3mskqfaZiLg2gipC5ToY1FyKMrvvQxIZrVsCiFAQyFFH+YoP/?= =?us-ascii?Q?k3KR1fNwYevy4ZabH+mXXA7P772JsrYx4kIWyCXCDKfosF3K1/2t01+GE6AZ?= =?us-ascii?Q?tKGfRlhYBT0Mf3U9MvGYY95zSxHylSnlHnnzaMsNti0vjgPf57gZ03SnW+Bk?= =?us-ascii?Q?VyVJn9oWeFsSJRUTu9J0P0/B7xuZscfusJ4ooTHkt5jDP9EjzG4NGxC3p4SM?= =?us-ascii?Q?El58ZiDqAb+A3E4ABPPivnd5f9RBEiS89JSaD6TRy5fh8d4Jr68UmLPgIKWB?= =?us-ascii?Q?aCQ4DQDokCDQz8K4k8n3aFEP0AxTQ6V6UzoxumFoZtanT9WWkpUN2KAV5FYP?= =?us-ascii?Q?d9XgTLkMGD3WJyIvoRtDkubNZeX7HLPIcqUnnBQ/whZdWCjVk/+AXbh9Qmjk?= =?us-ascii?Q?udkePf+PARSEhUN+N9q3eg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a119ac4d-472a-4e1f-290c-08d9cb6a4078 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2021 07:59:06.2741 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR05MB6789 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 51743 quit A similar patch was added in the core-updates branch and has been merged into master. From unknown Sat Aug 16 21:19:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 27 Jan 2022 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator