From patchwork Fri May 4 19:33:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27120 Received: (qmail 13956 invoked by alias); 4 May 2018 19:34:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 13941 invoked by uid 89); 4 May 2018 19:34:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.2 spammy=HERE, H*r:207, sk:update, universally X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 04 May 2018 19:34:11 +0000 Received: from ESESSHC020.ericsson.se (Unknown_Domain [153.88.183.78]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id C8.B6.30337.0B5BCEA5; Fri, 4 May 2018 21:34:08 +0200 (CEST) Received: from ESESBMB501.ericsson.se (153.88.183.168) by ESESSHC020.ericsson.se (153.88.183.78) with Microsoft SMTP Server (TLS) id 14.3.382.0; Fri, 4 May 2018 21:33:52 +0200 Received: from ESESSMB502.ericsson.se (153.88.183.163) by ESESBMB501.ericsson.se (153.88.183.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 4 May 2018 21:33:52 +0200 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Fri, 4 May 2018 21:33:51 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from [10.0.0.110] (192.222.164.54) by BL0PR1501MB2001.namprd15.prod.outlook.com (2603:10b6:207:31::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.735.16; Fri, 4 May 2018 19:33:49 +0000 Subject: Re: [PATCH] gdb: Update autotools version used for gnulib import To: CC: References: <1525459337-26977-1-git-send-email-simon.marchi@ericsson.com> From: Simon Marchi Message-ID: Date: Fri, 4 May 2018 15:33:35 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1525459337-26977-1-git-send-email-simon.marchi@ericsson.com> X-ClientProxiedBy: YQBPR0101CA0013.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00::26) To BL0PR1501MB2001.namprd15.prod.outlook.com (2603:10b6:207:31::31) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BL0PR1501MB2001; X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2001; 3:ym2p7JgH6QbgJXTSmDVumBmN8L+Zc6o74PZrLW2z7tY9Gfp1An1oqrdufZTmm0mNEGoIPC/bSq1GuB3pjw3y4Ob0qDHduJApwV+IH3/x5pCfq3TSt8851gAq5eq+jnmm0tMHhvaTUu8QHirKRJjq0AYfqDtjDkP6RdfNsnLacvEebFsGps0gJBqpJStjGbIJh2/7+32Wq+nr8vioL9mg+wKFISqK6ah2mAJa7yFJQHC+VNdPT/w/O5oBYlKigtn5; 25:m5TJGrIH7qW0CWkzghHVEAzvtMy1FEay3fP3ZYHCL+kWgh6CoEeRiYUWu+NHiSgb03GYg41OZSp0o2IonmoDR9qrVsdkdGI4184yb6DlyHkEX7q3eo+gTLaYWtmTq7QZeY+VFb5M23w0jSTtol9wEWlLTSPH9f3JaYvgt0o+R+FyCBjfeagqhSdG7vwRwZwwgBDu+08CzA6oUWh6/9Iaw1B5lUy/renyFjNLiyX+utR3+0dVn1MVU4Zhju9tJ5Y8uAroCPJXpXWLkg63B0Ydevkdlp1nC1BmJ0eAxvdPPRhrYmTwc9Csa7Do/RrkENtQH7OUh9Exya1qFMZ2o2HQvw==; 31:zpnx5HZzAFP33d1e7kfnQmYKJ4MilT6HN5FgvX9Iyq/dqSpa71uhD5/jOr6dAOe/0LeWYnhQi6qkV7ByZn2RmLbnGAKQMJXJEkwip/n2ApiSV9nV0uPFFzI1/QYbKl6i8SFREfvOFPYi1/H4I2XC/atY5b5oP4XrqyOKa6/pliui5InlfF7BwBXGHMvmffgekzG0xAj6zIdVzVZdq6QK92Zr0B4GHpphC+qgB1oUkGg= X-MS-TrafficTypeDiagnostic: BL0PR1501MB2001: X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2001; 20:xWmCVKyXHBfdn7h/1xvDffUJGUz00biIT8hai78Z56kcstuM2NLu/SsaiBem3RV8VYQfNjaLoG/5Lhpw0sIPNBiXRX+fFO/KEHldfM1TlYZwnSlQKC0LCOHgiPSxVdIaCWunQQfX271+l5o6U26G9zdVDfJubxp1mI0PeKz68O2hCRDh21gY7hg+ViLjVxWqZkm1wogZZQp4ZkGHzpoRCQS45hLcd6p/rExjhQBzxEQsAJ0aQIroArwS9XoUdXcs+2K9oVmi9vxpoRY1XckuTHgCh7r5d2uEGbXrn5aDY8dguIvCPNCIORlF9VBw9nVGq43Yb1s5U0cT1sw0BAEJb/sCljgx5JJvOqkSRlf9RLbNcwiV/W7suubDuI+9tUnsHcbsuaks6ohW0XpQzoZun5irQr8zPv08KDF01xR8kjWisdsHEdDIv97RvLb/Mgyp5y/4+xTk/YWVCz8BoTPq5skKXxGKRjfjr50yEoB9vkr/OM7amSUkJ0/30bUUi4c8; 4:r5EwleixZQ09cTs3TK5bHthxftHvY4qXO85bqzAiY+mVFjOAhzaCTpAKzZM9SKY+v33JTlinOU07sFlgZpO/LsmYDqlFmni0akxKbNvtMQUfYEy86mgDFIFAfGsnDefdjPqm5QNe8R+MjtWVeyoK/GcMOMh18yE841/PcA50OIFxTvpr8oVCLuPWxfpPWCVar1UVQysAaFpicnStEfXcy2FLPOBgjzjDaJg09/DR15Onx8sViPnMKG+ShIziO+hMhEFaN+pHVNMMruYFo2UrVDKAXz0S5N9Vi58aKKi0lStchmTU4+faFdwARPYAjnOI5/yorTHWwV0jlpu5j3xMJu2HdwDl7+mxP4NQJyYhexM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(10201501046)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:BL0PR1501MB2001; BCL:0; PCL:0; RULEID:; SRVR:BL0PR1501MB2001; X-Forefront-PRVS: 06628F7CA4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(376002)(346002)(39380400002)(396003)(39860400002)(366004)(377424004)(199004)(189003)(97736004)(230700001)(6306002)(6116002)(3846002)(68736007)(2906002)(31686004)(65826007)(26005)(81156014)(81166006)(66066001)(52146003)(65806001)(77096007)(8936002)(65956001)(450100002)(105586002)(58126008)(8676002)(47776003)(5660300001)(7736002)(106356001)(16576012)(316002)(4326008)(2486003)(2351001)(23676004)(2361001)(478600001)(31696002)(15650500001)(6486002)(59450400001)(53546011)(6246003)(476003)(956004)(386003)(2616005)(52116002)(446003)(11346002)(76176011)(44832011)(50466002)(6916009)(53936002)(36756003)(6666003)(966005)(186003)(305945005)(486006)(229853002)(86362001)(575784001)(25786009)(16526019)(64126003); DIR:OUT; SFP:1101; SCL:1; SRVR:BL0PR1501MB2001; H:[10.0.0.110]; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDBQUjE1MDFNQjIwMDE7MjM6VGp3Q3RIVmE2WVRZZEZkMnBmQVNEbTFR?= =?utf-8?B?Nk9SQ1RCMTdUS3p5dzFxei92RXY3UkplT29Oc0hTYjZPVUs4Y0V4QzFVejN5?= =?utf-8?B?bU45Y0szTjNDVEJHSEI1WjgvOWtPdjFjQVR1MmpTL2pOUkdYL2xGMStWY1VJ?= =?utf-8?B?Q2JjM3NxRWluOUpZY25SZTFpcDNCQ2UrejVzTTlKbzNHQWZKakQ2TTFncjFX?= =?utf-8?B?UHY3Zy9kZjdEZWgzVFQ2MXFVeW5NbW96NkJ4ci9yUlZXVG9SOTB4RXp1MkZ2?= =?utf-8?B?dlMrTmkvQU8vcThXSDJsWjFQcmt3Q0ltTFp2VXlTS2I3d3lheVFrT3VTWnoy?= =?utf-8?B?a0JNajVTR005bXlidEdMdVZTUndvUFhxTzkyeVA2YWVuTDR4eWNqdytXQzRM?= =?utf-8?B?eXhKb2F2WFozeE5ZT3M3M21VSjVjYmFMM3VuYkFlYzFIV0V6dGZFNmF0WUNo?= =?utf-8?B?L0t6bjBPRkU5L0xGM1RoRkJqenVCcFpGMm43NU5KYThIM3YwRkt0RlVLLy9l?= =?utf-8?B?QS9TakRzQWU0M3JaMUtYL3p6L0Fxdm5EU1BYWVNucm1YMEJIZlozOThNQTdH?= =?utf-8?B?TXFrMnZUNTRtK3dORHdVT0hvTjVGd0w1WjhFRjdlYkprcFZZcGtWRU1OaDNO?= =?utf-8?B?ZWFPUXFaQnRWNmlINXBKcld0VWtVVzg0WW9HM3IrbHZ4WmlUSWo1WGZUUnU1?= =?utf-8?B?YUJ5M293QTh5Z2lIU0h1ejVHTkNKMlRCN2lyMk9HVllLMTNHeFVOa3NmYVRX?= =?utf-8?B?T0p3VXNYSERnbFRwMFhYdm5QcHFvdCtiSDUrN1lPcXJmY0EwWE1PczhYMlF1?= =?utf-8?B?cXl0R1lXVE56L1dQemM1aUhGbDE3UlhqR1UxdGpVWkJxeDFhY1BzVUNqbTFz?= =?utf-8?B?aFJzSVBGbW1IaDlWZVdibjc4TWZnTkw0YVAvVU1kN1R5TUZNendtaDloeFR5?= =?utf-8?B?NzFPekZwOGVFc3p4azMzSHBkRXFzYzNNaVVaTFpjRURLWXE1ZXFpQ25CQjV6?= =?utf-8?B?ZXhxMzladGY0V2R6SEpGR3JrbkhaZDZUb0YwQ1M4YTN3YmtMVjYraHRCdStH?= =?utf-8?B?TjdMM1pRa3VqUlk2cHloK0pzYXN6NjVuWmpFeklPV05nSWJtbzFvdFVCc29h?= =?utf-8?B?UU9qcjFEa3IwSUk3Vkg2U3dBaWZwdnY1U1FxVVdYS3BqV3hoWnZFdHZOcjFP?= =?utf-8?B?a2tTVGxjOVFWTHh5Ykl4VkQ5NzV6ZWxPZFFLN1h4K1ZGRUdNa21ybmNpWnRG?= =?utf-8?B?Tm04d3FhenNrMTlydVZ0VUtPTzIrQVdlNndsRURQT3RSbFIyVDN3M3RUM0Zl?= =?utf-8?B?MklQV0tIRTF0YUhJcXNqVmN5OUtDZFFSY1gwQVFSR2psRmUreTNqTHpBcWdL?= =?utf-8?B?R3E5bW9LN3N1dHYxNGN2VlltdEpRcWpnZ0dYYmE0S2ppbWhDS0l1ZlhUYUZo?= =?utf-8?B?QU9ubTd4SDBZWXVJWmxuOTBvMnRhbHZhWFFHTEZRZ29ybmVkTUYzKzFDZUkr?= =?utf-8?B?enF0Vy9VZ09mbVF6bkY4TUk4VG1zd09NVlk5OGpCUGd0bjNqYVZEZFJvUUly?= =?utf-8?B?VUtSWVRDek1yNXpsQkIvS2o2QUU1ZUN6S1R2NmFHc0QrMmZLTC9EYlR3bW4y?= =?utf-8?B?QkdGc0ZLUlpQcnpuL3NFSktLMi9uMFNvVXJGYUw0bE1HWkkrMjFxaVQ0b0Z1?= =?utf-8?B?YU4yS3hLOXdQTjNpbUVxbzNzZ0RLanZMck1UaUlaVkU2V3RNTHMzRjlveEkr?= =?utf-8?B?bnJ4M3JaNFZPR0pYdWpQZzBsc1hOVEdNMXp5UDF2N2o0cUNmcW44RUQrRXla?= =?utf-8?B?Wk9UZUJ6U2VORHZsbW4zUTRPQ0NWTEIvUnQ3QkY3TnZpS2tmcWgvYlRDbFNC?= =?utf-8?B?T2szVkRxazJaam9zamRaQ25WU28rTS9SaGNNSDVqSm9DakZidnRhc0hQTjBy?= =?utf-8?B?Z0JndGJCcVFEL0RwcG81cWhiUGMwb3NBWCtnMzJURW1ZOXFTT2lTMnpXN2JN?= =?utf-8?B?ZmhveHJXdXVWck8veHpoQkk4cXNxNXpBMVJ0V29QWnVKY1F6M0RJRlIyeUJs?= =?utf-8?B?U1ZFRjZaMnMzZmtWTXZLZExpUnFKaVJqalV5UVVjaHhjSGdnWWY3YUljdTVx?= =?utf-8?B?VjYycG1pMUpxZFNaL2F5aDYvYVkyNDduNTFSK2tHZE8rY1B3c0FieHM3Vk13?= =?utf-8?Q?fJm9KXk86GajhT6uZgApC06kalcNiepggpU/gpUh1ugk=3D?= X-Microsoft-Antispam-Message-Info: PJzQVRd7VaAriUjBarBW4T16Rr2871Hi6M2AqYB/8UeHojHuMD1zpwWARiN06U86YRdFdBiy8ntmqICWKIK80629Bse3G+Q5nDpFH8zUOfpZDJlh5ZJIai/eCMU10jtmCOmkvtjEmTNucIdCZR8kiZJuZ+r9kKszwPeuYWGtn6A1T45YkOJitGTnWhJ6kYdI X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2001; 6:+7jnKViIsxTgpL03s/aKd5po6JBxhrzyQvVVhDNyQh7DuLU7aLqxy4S5knljPGVG/A/OpaYx9YfF+NYDH5hqHvZkL1uM4A8fEo8lVWwrFPrtL60IxtCnAPV2L6xg2n/4nEE1WHxcFPNTaGHsJ1xlbCUeFvvXmnaMw8uaajitVnaqorq1UKPrAjIE4XyPBO/DT+W/Xi/mQHiH5/PfKr7hfI5rf0X1rS6piqnoB0I7QDg2IyUUgMAkAzKpCQeVxAaYeEGquGeL3CrWXFs/s/x9GTurRuKgE8P7eNYIUuU/ZVTf5aCXQ0jUB60sZoGnv+fFVXoycITGVozltcgr9Q+aoXEivKP25DY4CXlB1+cj3WQeshfgJCG66nahwso2p8X8ZXqfu4gJxiB8FjIUJkCY+jRocSVt4N8Z4EoR3WSfLSfP3mgjtgOufJAwbCfPvDaKqnRVVI0KMAIU+JF1w3ezNg==; 5:QOA9KSZozuqGAEmHGY8c8dBN99e+grltrkGT44qgo2jhwcACzSlJkkvSLU6F9cNSdksAFHLrJIRUBLAsP6L09CI4+DVFGOWlRfTv0IK6E5c0mJqEHYQyOAyn5Fr21DSZ9JxCTzRV2kZ/XIFDEZRos+g+bYmFsDD2ZEVybNrb8hs=; 24:Bg0R8LKz2CgXNyXWbbhamRulWFFjE2hRyQ5gTOMGfAEdsHWnTEXKLr+jj26fAlOIoyWBL872ca5iDM0+zoquzfJF4u4ibluBWN98GnO7mkg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2001; 7:YtMLHjcWdrF/7ISqYAB6yaSHLF70EuPdAogKThU8wRqfUbyYQDl1I46ZzHBarKo/wPvKxfmX69Loa9qFUwbf8MU5kcN9jtYpc0bU+sQPwUu5o4CCKth3FbmUb14d14SJo1i2rBiOVGB/yfbGCTthTp44tpKNMctVkKm8e9iBDlJ0E+cEoI7b+KduQXAkzssyufZX5hphyhDfaF0lud6OYrL63SA08CvuMokWtVHHdrrseyRzYqyOiG2NTHUq2yrF X-MS-Office365-Filtering-Correlation-Id: 27319386-bc92-4399-adef-08d5b1f5f623 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2018 19:33:49.4228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27319386-bc92-4399-adef-08d5b1f5f623 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR1501MB2001 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes On 2018-05-04 02:42 PM, Simon Marchi wrote: > When trying to run the update-gnulib.sh script, I get this: > > Error: Wrong automake version (Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\${ <-- HERE ([^ =:+{}]+)}/ at /opt/automake/1.11.1/bin/automake line 4113.), we need 1.11.1. > Aborting. > > It's an issue with a regex in automake that triggers a warning starting > with Perl 5.22. It has been fixed in automake 1.15.1. So I think it's > a good excuse to bump the versions of autoconf and automake used in the > gnulib import. > > For autoconf, the 2.69 version is universally available, so it'S an easy > choice. For automake, different distros and distro versions have > different automake versions, so there's no version that would make > everybody happy. I just went with 1.16.1, the latest release. It's > quite easy to build it from source. > > The newer automake errors out and points out that we should modernize > our usage of AM_INIT_AUTOMAKE: > > https://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation > > so I did that too. > > It also complains about missing ../../ar-lib, so I ran automake > --add-missing to add it (which is why I CCed the binutils mailing list). When doing a full build, I got a few of these errors which I did not get previously: CXX gdb.o In file included from /home/emaisin/src/binutils-gdb/gdb/common/common-defs.h:32:0, from /home/emaisin/src/binutils-gdb/gdb/defs.h:28, from /home/emaisin/src/binutils-gdb/gdb/gdb.c:19: ./build-gnulib/config.h:1596:0: error: "PACKAGE_NAME" redefined [-Werror] #define PACKAGE_NAME "libgnu" ^ In file included from /home/emaisin/src/binutils-gdb/gdb/common/common-defs.h:23:0, from /home/emaisin/src/binutils-gdb/gdb/defs.h:28, from /home/emaisin/src/binutils-gdb/gdb/gdb.c:19: ./config.h:615:0: note: this is the location of the previous definition #define PACKAGE_NAME "" ^ The problem is that gdb/configure and gdb/gnulib/configure now generate different value for these macros. I don't think we really care about these values, so we can probably just undef them between including both config.h files. To be safe, I also suggest undefining them after, to be sure we don't rely on them anywhere. I would amend the original patch with the one below. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 881a4ea..eb0ec21 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -21,12 +21,23 @@ #define COMMON_DEFS_H #include "config.h" + +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME + #ifdef GDBSERVER #include "build-gnulib-gdbserver/config.h" #else #include "build-gnulib/config.h" #endif +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME + /* From: https://www.gnu.org/software/gnulib/manual/html_node/stdint_002eh.html