From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 2034E1F5AE for ; Tue, 27 Apr 2021 18:28:32 +0000 (UTC) Received: from localhost ([::1]:53956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbSRi-0003z5-Jm for normalperson@yhbt.net; Tue, 27 Apr 2021 14:28:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbSRe-0003yn-Gz for bug-gnulib@gnu.org; Tue, 27 Apr 2021 14:28:26 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:59210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbSRc-0007yP-1q for bug-gnulib@gnu.org; Tue, 27 Apr 2021 14:28:25 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id C7D7B160121; Tue, 27 Apr 2021 11:28:21 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id yFQaiNlKcIyT; Tue, 27 Apr 2021 11:28:20 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B669516014B; Tue, 27 Apr 2021 11:28:20 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id QYpfb0uXm47O; Tue, 27 Apr 2021 11:28:20 -0700 (PDT) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 8D2E1160121; Tue, 27 Apr 2021 11:28:20 -0700 (PDT) Subject: Re: commit eb32c992 causes trouble on older Debian To: Benno Schulenberg , bug-gnulib@gnu.org References: <04a87155-c80f-555e-8f39-67c00adeb296@telfort.nl> From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: <0599977f-a027-7483-0c2e-5d67dd45c713@cs.ucla.edu> Date: Tue, 27 Apr 2021 11:28:20 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <04a87155-c80f-555e-8f39-67c00adeb296@telfort.nl> Content-Type: multipart/mixed; boundary="------------FAFA9E78BCB0F7F90AD3B950" Content-Language: en-US Received-SPF: pass client-ip=131.179.128.68; envelope-from=eggert@cs.ucla.edu; helo=zimbra.cs.ucla.edu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This is a multi-part message in MIME format. --------------FAFA9E78BCB0F7F90AD3B950 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for reporting that. I installed the attached into Gnulib to try to work around the problem. Please give it a try (I haven't tested it on older Debian). --------------FAFA9E78BCB0F7F90AD3B950 Content-Type: text/x-patch; charset=UTF-8; name="0001-libc-config-fix-include-problem-on-older-Debian.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-libc-config-fix-include-problem-on-older-Debian.patch" >From 7b152eb2c2fbabce7eb7b1f789ad6feb0966bbd9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 27 Apr 2021 11:23:28 -0700 Subject: [PATCH] libc-config: fix include problem on older Debian https://lists.gnu.org/r/bug-gnulib/2021-04/msg00198.html * lib/cdefs.h: Use __GNULIB_CDEFS, not __GLIBC__, to determine whether to include the bits/* files. * lib/libc-config.h (__WORDSIZE): Remove. (__GNULIB_CDEFS): New macro. --- ChangeLog | 9 +++++++++ lib/cdefs.h | 6 +++--- lib/libc-config.h | 10 +++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc7427cb0..a110509f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-04-27 Paul Eggert + + libc-config: fix include problem on older Debian + https://lists.gnu.org/r/bug-gnulib/2021-04/msg00198.html + * lib/cdefs.h: Use __GNULIB_CDEFS, not __GLIBC__, + to determine whether to include the bits/* files. + * lib/libc-config.h (__WORDSIZE): Remove. + (__GNULIB_CDEFS): New macro. + 2021-04-26 Paul Eggert gnulib-tool: port better to current Autoconf diff --git a/lib/cdefs.h b/lib/cdefs.h index 9618152ab..b883b2566 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -489,9 +489,9 @@ [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] #endif -/* The #ifndef lets Gnulib avoid including these on non-glibc - platforms, where the includes typically do not exist. */ -#ifdef __GLIBC__ +/* Gnulib avoids including these, as they don't work on non-glibc or + older glibc platforms. */ +#ifndef __GNULIB_CDEFS # include # include #endif diff --git a/lib/libc-config.h b/lib/libc-config.h index f2c86144b..fabca2fa3 100644 --- a/lib/libc-config.h +++ b/lib/libc-config.h @@ -80,13 +80,9 @@ # ifndef _FEATURES_H # define _FEATURES_H 1 # endif -/* Define __WORDSIZE so that does not attempt to include - nonexistent files. Make it a syntax error, since Gnulib does not - use __WORDSIZE now, and if Gnulib uses it later the syntax error - will let us know that __WORDSIZE needs configuring. */ -# ifndef __WORDSIZE -# define __WORDSIZE %%% -# endif +/* Define __GNULIB_CDEFS so that does not attempt to include + nonexistent files. */ +# define __GNULIB_CDEFS /* Undef the macros unconditionally defined by our copy of glibc , so that they do not clash with any system-defined versions. */ -- 2.27.0 --------------FAFA9E78BCB0F7F90AD3B950--