From patchwork Thu Nov 11 04:50:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 34391 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4032B27BBE1; Thu, 11 Nov 2021 04:55:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 22FE627BBE4 for ; Thu, 11 Nov 2021 04:55:14 +0000 (GMT) Received: from localhost ([::1]:34598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ml27F-0001Uh-5r for patchwork@mira.cbaines.net; Wed, 10 Nov 2021 23:55:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml274-0001Lp-MD for guix-patches@gnu.org; Wed, 10 Nov 2021 23:55:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ml274-0003wc-DQ for guix-patches@gnu.org; Wed, 10 Nov 2021 23:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ml274-0007KP-CX for guix-patches@gnu.org; Wed, 10 Nov 2021 23:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51743] [PATCH] cross-base: fix environment variables patch for GCC 10 Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Nov 2021 04:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51743 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51743@debbugs.gnu.org, fanquake@gmail.com Received: via spool by 51743-submit@debbugs.gnu.org id=B51743.163660648828138 (code B ref 51743); Thu, 11 Nov 2021 04:55:02 +0000 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 Date: Wed, 10 Nov 2021 23:50:55 -0500 Message-ID: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 */