From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#11529: redoing gnulib import to avoid 8+3 glitches Date: Sun, 20 May 2012 20:12:53 -0700 Organization: UCLA Computer Science Department Message-ID: <4FB9B2B5.3000807@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1337570022 2212 80.91.229.3 (21 May 2012 03:13:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 21 May 2012 03:13:42 +0000 (UTC) To: 11529@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 21 05:13:41 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SWJ3t-000786-01 for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 May 2012 05:13:33 +0200 Original-Received: from localhost ([::1]:35359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3s-00055M-Dc for geb-bug-gnu-emacs@m.gmane.org; Sun, 20 May 2012 23:13:32 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3p-00055F-A7 for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:13:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWJ3n-0000GM-Ag for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:13:28 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:54695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWJ3n-0000GI-7A for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:13:27 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SWJ4M-0007a2-EV for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 23:14:02 -0400 X-Loop: help-debbugs@gnu.org 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: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133757002029096 (code B ref -1); Mon, 21 May 2012 03:14:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 May 2012 03:13:40 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60250 Archived-At: 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