From unknown Wed Sep 10 18:55:35 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11529: redoing gnulib import to avoid 8+3 glitches Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 May 2012 03:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11529 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 11529@debbugs.gnu.org Cc: Eli Zaretskii X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.133757002029096 (code B ref -1); Mon, 21 May 2012 03:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2012 03:13:40 +0000 Received: from localhost ([127.0.0.1]:36008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ3z-0007ZC-RU for submit@debbugs.gnu.org; Sun, 20 May 2012 23:13:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41922) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ3x-0007Z0-MY for submit@debbugs.gnu.org; Sun, 20 May 2012 23:13:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWJ3H-0000Df-Cn for submit@debbugs.gnu.org; Sun, 20 May 2012 23:12:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:44919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3H-0000Da-9d for submit@debbugs.gnu.org; Sun, 20 May 2012 23:12:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3F-00051Z-6F for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:12:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWJ3C-0000CT-S4 for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:12:52 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:58481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3C-0000CP-Je; Sun, 20 May 2012 23:12:50 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id B46F939E800B; Sun, 20 May 2012 20:12:48 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pQFU5K+IKJON; Sun, 20 May 2012 20:12:48 -0700 (PDT) Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id D3B2039E8008; Sun, 20 May 2012 20:12:47 -0700 (PDT) Message-ID: <4FB9B2B5.3000807@cs.ucla.edu> Date: Sun, 20 May 2012 20:12:53 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.2 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) On 05/07/2012 11:28 PM, Paul Eggert wrote: > I'll look at > reworking the 8+3-related build-procedure code that cost me time > on Friday, so that it's less likely to do so in the future. Here's a proposed patch to do that. I've tested it on GNU/Linux, though not on DOS. === modified file 'ChangeLog' --- ChangeLog 2012-05-21 02:33:13 +0000 +++ ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,5 +1,14 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4, except on DOS. + Previously the file was named m4/gl-comp.m4 on all hosts, + even though the file's name in gnulib is m4/gnulib-comp.m4. + This had a problem when merging from gnulib, as the code temporarily + renamed it to the full name, causing problems when interrupted. + With this change, the file ordinarily has its full name, except + that on DOS it has the shorter name. + * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4. + Make merging from gnulib a script, not a makefile action. Putting it in a makefile has some problems with reflection, as merging from gnulib updates 'configure', which can update the makefile. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-21 02:33:13 +0000 +++ admin/ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4, except on DOS. + * merge-gnulib: Leave m4/gnulib-comp.m4's name alone. + Make merging from gnulib a script, not a makefile action. * merge-gnulib: New script, with actions moved here from ../Makefile.in. === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2012-05-21 02:33:13 +0000 +++ admin/merge-gnulib 2012-05-21 03:00:32 +0000 @@ -79,10 +79,8 @@ exit 1 } -cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 && "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && -mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} === renamed file 'm4/gl-comp.m4' => 'm4/gnulib-comp.m4' === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-05-19 18:04:49 +0000 +++ msdos/ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,3 +1,10 @@ +2012-05-21 Paul Eggert + + Use full name for m4/gnulib-comp.m4, except on DOS. + * INSTALL: Describe how to rename m4/gnulib-comp.m4 to m4/gl-comp.m4 + when unpacking. + * sedlibcf.inp: Substitute the shorter name for the longer. + 2012-05-19 Paul Eggert * sed2v2.inp (HAVE_MBLEN): Remove. === modified file 'msdos/INSTALL' --- msdos/INSTALL 2012-01-19 07:21:25 +0000 +++ msdos/INSTALL 2012-05-21 03:00:32 +0000 @@ -73,6 +73,10 @@ 67-character limit on the file-name length imposed by DOS filesystems. When prompted by `djtar' for a different name for these files, just press [Enter] to skip them: they are not needed for the DJGPP build. +Similarly, unpacking complains that the file names m4/gnulib-comp.m4 +and m4/gnulib-common.m4 clash when truncated to DOS 8.3 limits; when +prompted by 'djtar' for an alternate name for m4/gnulib-comp.m4, +choose the name m4/gl-comp.m4. If you want to print international characters, install the intlfonts distribution. For this, create a directory called `fonts' under the === modified file 'msdos/sedlibcf.inp' --- msdos/sedlibcf.inp 2012-01-05 09:46:05 +0000 +++ msdos/sedlibcf.inp 2012-05-21 03:00:32 +0000 @@ -19,4 +19,5 @@ # # ---------------------------------------------------------------------- s/c++defs/cxxdefs/g +s/gnulib-comp\.m4/gl-comp.m4/g s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g From debbugs-submit-bounces@debbugs.gnu.org Sun May 20 23:17:09 2012 Received: (at control) by debbugs.gnu.org; 21 May 2012 03:17:09 +0000 Received: from localhost ([127.0.0.1]:36013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ7M-0007fD-Q8 for submit@debbugs.gnu.org; Sun, 20 May 2012 23:17:09 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:50481) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ7K-0007eq-IT for control@debbugs.gnu.org; Sun, 20 May 2012 23:17:06 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 566FE39E800B for ; Sun, 20 May 2012 20:16:25 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id deP1Za3OnXLj for ; Sun, 20 May 2012 20:16:25 -0700 (PDT) Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 0E5DA39E8008 for ; Sun, 20 May 2012 20:16:25 -0700 (PDT) Message-ID: <4FB9B38E.3040500@cs.ucla.edu> Date: Sun, 20 May 2012 20:16:30 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: control@debbugs.gnu.org Subject: forgot to mark that 11529 has a patch Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) tags 11529 patch From unknown Wed Sep 10 18:55:35 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11529: redoing gnulib import to avoid 8+3 glitches Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 May 2012 17:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11529 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Paul Eggert Cc: 11529@debbugs.gnu.org X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Reply-To: Eli Zaretskii Received: via spool by submit@debbugs.gnu.org id=B.133762308320128 (code B ref -1); Mon, 21 May 2012 17:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2012 17:58:03 +0000 Received: from localhost ([127.0.0.1]:37542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWWrq-0005Eb-Mf for submit@debbugs.gnu.org; Mon, 21 May 2012 13:58:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50499) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWWrW-0005Dq-DF for submit@debbugs.gnu.org; Mon, 21 May 2012 13:58:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWWql-0005XM-K1 for submit@debbugs.gnu.org; Mon, 21 May 2012 13:56:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:48972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWWql-0005X5-Gd for submit@debbugs.gnu.org; Mon, 21 May 2012 13:56:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWWqj-0000Ew-RT for bug-gnu-emacs@gnu.org; Mon, 21 May 2012 13:56:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWWqh-0005Wd-Oc for bug-gnu-emacs@gnu.org; Mon, 21 May 2012 13:56:53 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:57430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWWqh-0005WW-GW for bug-gnu-emacs@gnu.org; Mon, 21 May 2012 13:56:51 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0M4D00100W8RPN00@a-mtaout20.012.net.il> for bug-gnu-emacs@gnu.org; Mon, 21 May 2012 20:56:18 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.210.75]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M4D00192WHT9H90@a-mtaout20.012.net.il>; Mon, 21 May 2012 20:56:18 +0300 (IDT) Date: Mon, 21 May 2012 20:56:25 +0300 From: Eli Zaretskii In-reply-to: <4FB9B2B5.3000807@cs.ucla.edu> X-012-Sender: halo1@inter.net.il Message-id: <83txz9xvsm.fsf@gnu.org> References: <4FB9B2B5.3000807@cs.ucla.edu> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) > Date: Sun, 20 May 2012 20:12:53 -0700 > From: Paul Eggert > CC: Eli Zaretskii > > --- msdos/INSTALL 2012-01-19 07:21:25 +0000 > +++ msdos/INSTALL 2012-05-21 03:00:32 +0000 > @@ -73,6 +73,10 @@ > 67-character limit on the file-name length imposed by DOS filesystems. > When prompted by `djtar' for a different name for these files, just > press [Enter] to skip them: they are not needed for the DJGPP build. > +Similarly, unpacking complains that the file names m4/gnulib-comp.m4 > +and m4/gnulib-common.m4 clash when truncated to DOS 8.3 limits; when > +prompted by 'djtar' for an alternate name for m4/gnulib-comp.m4, > +choose the name m4/gl-comp.m4. > > If you want to print international characters, install the intlfonts > distribution. For this, create a directory called `fonts' under the > > === modified file 'msdos/sedlibcf.inp' > --- msdos/sedlibcf.inp 2012-01-05 09:46:05 +0000 > +++ msdos/sedlibcf.inp 2012-05-21 03:00:32 +0000 > @@ -19,4 +19,5 @@ > # > # ---------------------------------------------------------------------- > s/c++defs/cxxdefs/g > +s/gnulib-comp\.m4/gl-comp.m4/g > s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g Thanks, but I'd rather we don't go that way. We've been through this before: this cure is worse than the disease, certainly for me. The one package where I actually tried that (GDB) proved to me that this way lies madness. Is this the best that can be done? Could the offending file be renamed in gnulib in some way that eliminates the problem? If not, just leave the file at its original name, without any changes to MS-DOS specific files, and I will find my own solution that will not bother anyone but me. From unknown Wed Sep 10 18:55:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Paul Eggert Subject: bug#11529: closed (Re: redoing gnulib import to avoid 8+3 glitches) Message-ID: References: <4FBA91ED.8030605@cs.ucla.edu> <4FB9B2B5.3000807@cs.ucla.edu> X-Gnu-PR-Message: they-closed 11529 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 11529@debbugs.gnu.org Date: Mon, 21 May 2012 19:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1337627222-26543-1" This is a multi-part message in MIME format... ------------=_1337627222-26543-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11529: redoing gnulib import to avoid 8+3 glitches which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 11529@debbugs.gnu.org. --=20 11529: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11529 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1337627222-26543-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 11529-done) by debbugs.gnu.org; 21 May 2012 19:06:07 +0000 Received: from localhost ([127.0.0.1]:37593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWXvi-0006sx-0p for submit@debbugs.gnu.org; Mon, 21 May 2012 15:06:06 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:52527) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWXvf-0006sO-KJ for 11529-done@debbugs.gnu.org; Mon, 21 May 2012 15:06:04 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id AF57339E8007; Mon, 21 May 2012 12:05:18 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2rX-PpIef25j; Mon, 21 May 2012 12:05:17 -0700 (PDT) Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id DBB3639E8006; Mon, 21 May 2012 12:05:17 -0700 (PDT) Message-ID: <4FBA91ED.8030605@cs.ucla.edu> Date: Mon, 21 May 2012 12:05:17 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: redoing gnulib import to avoid 8+3 glitches References: <4FB9B2B5.3000807@cs.ucla.edu> <83txz9xvsm.fsf@gnu.org> In-Reply-To: <83txz9xvsm.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11529-done Cc: 11529-done@debbugs.gnu.org, Gnulib bugs X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) Re , Eli Zaretskii wrote: > Could the offending file be renamed in gnulib in some way that > eliminates the problem? We asked about that earlier, and the consensus on the gnulib side was that porting to 8+3 file name restrictions was outside gnulib's scope. The solution that we came up at the time was to have the Emacs sync-from-gnulib (now merge-gnulib) procedure rename a file both before and after gnulib-tool, temporarily, so that gnulib-tool sees the long file name but Emacs otherwise sees the short one. Unfortunately this has proved to be a problem in practice. One way to satisfy your request would be to add a gnulib-tool option such as --file-name-prefix=PREFIX (default "gnulib-") so that gnulib-tool can generate differently-named files that will happen to fit in 8+3 limits if Emacs uses --file-name-prefix="gl-". Unfortunately gnulib-tool is a 6700-line shell script with a reasonable amount of complexity re caching and inferring file name options; I briefly looked into writing and debugging such a change but it looked like it might be more trouble than it's worth. There's a project to rewrite gnulib-tool from scratch, for performance reasons. Maybe adding such an option will be easier if and when that's done. I'll CC: this message to bug-gnulib to give that project a heads-up about this need. > If not, just leave the file at its original name, without any changes > to MS-DOS specific files, and I will find my own solution that will > not bother anyone but me. OK, thanks, that's simple, and I've done that for now and am closing bug 11529. We can improve this if and when gnulib-tool gets that option. ------------=_1337627222-26543-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 May 2012 03:13:40 +0000 Received: from localhost ([127.0.0.1]:36008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ3z-0007ZC-RU for submit@debbugs.gnu.org; Sun, 20 May 2012 23:13:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41922) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWJ3x-0007Z0-MY for submit@debbugs.gnu.org; Sun, 20 May 2012 23:13:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWJ3H-0000Df-Cn for submit@debbugs.gnu.org; Sun, 20 May 2012 23:12:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:44919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3H-0000Da-9d for submit@debbugs.gnu.org; Sun, 20 May 2012 23:12:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3F-00051Z-6F for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:12:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWJ3C-0000CT-S4 for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:12:52 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:58481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3C-0000CP-Je; Sun, 20 May 2012 23:12:50 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id B46F939E800B; Sun, 20 May 2012 20:12:48 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pQFU5K+IKJON; Sun, 20 May 2012 20:12:48 -0700 (PDT) Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id D3B2039E8008; Sun, 20 May 2012 20:12:47 -0700 (PDT) Message-ID: <4FB9B2B5.3000807@cs.ucla.edu> Date: Sun, 20 May 2012 20:12:53 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: redoing gnulib import to avoid 8+3 glitches Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: submit Cc: Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) On 05/07/2012 11:28 PM, Paul Eggert wrote: > I'll look at > reworking the 8+3-related build-procedure code that cost me time > on Friday, so that it's less likely to do so in the future. Here's a proposed patch to do that. I've tested it on GNU/Linux, though not on DOS. === modified file 'ChangeLog' --- ChangeLog 2012-05-21 02:33:13 +0000 +++ ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,5 +1,14 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4, except on DOS. + Previously the file was named m4/gl-comp.m4 on all hosts, + even though the file's name in gnulib is m4/gnulib-comp.m4. + This had a problem when merging from gnulib, as the code temporarily + renamed it to the full name, causing problems when interrupted. + With this change, the file ordinarily has its full name, except + that on DOS it has the shorter name. + * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4. + Make merging from gnulib a script, not a makefile action. Putting it in a makefile has some problems with reflection, as merging from gnulib updates 'configure', which can update the makefile. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-05-21 02:33:13 +0000 +++ admin/ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,5 +1,8 @@ 2012-05-21 Paul Eggert + Use full name for m4/gnulib-comp.m4, except on DOS. + * merge-gnulib: Leave m4/gnulib-comp.m4's name alone. + Make merging from gnulib a script, not a makefile action. * merge-gnulib: New script, with actions moved here from ../Makefile.in. === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2012-05-21 02:33:13 +0000 +++ admin/merge-gnulib 2012-05-21 03:00:32 +0000 @@ -79,10 +79,8 @@ exit 1 } -cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 && "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && -mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} === renamed file 'm4/gl-comp.m4' => 'm4/gnulib-comp.m4' === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-05-19 18:04:49 +0000 +++ msdos/ChangeLog 2012-05-21 03:00:32 +0000 @@ -1,3 +1,10 @@ +2012-05-21 Paul Eggert + + Use full name for m4/gnulib-comp.m4, except on DOS. + * INSTALL: Describe how to rename m4/gnulib-comp.m4 to m4/gl-comp.m4 + when unpacking. + * sedlibcf.inp: Substitute the shorter name for the longer. + 2012-05-19 Paul Eggert * sed2v2.inp (HAVE_MBLEN): Remove. === modified file 'msdos/INSTALL' --- msdos/INSTALL 2012-01-19 07:21:25 +0000 +++ msdos/INSTALL 2012-05-21 03:00:32 +0000 @@ -73,6 +73,10 @@ 67-character limit on the file-name length imposed by DOS filesystems. When prompted by `djtar' for a different name for these files, just press [Enter] to skip them: they are not needed for the DJGPP build. +Similarly, unpacking complains that the file names m4/gnulib-comp.m4 +and m4/gnulib-common.m4 clash when truncated to DOS 8.3 limits; when +prompted by 'djtar' for an alternate name for m4/gnulib-comp.m4, +choose the name m4/gl-comp.m4. If you want to print international characters, install the intlfonts distribution. For this, create a directory called `fonts' under the === modified file 'msdos/sedlibcf.inp' --- msdos/sedlibcf.inp 2012-01-05 09:46:05 +0000 +++ msdos/sedlibcf.inp 2012-05-21 03:00:32 +0000 @@ -19,4 +19,5 @@ # # ---------------------------------------------------------------------- s/c++defs/cxxdefs/g +s/gnulib-comp\.m4/gl-comp.m4/g s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g ------------=_1337627222-26543-1--