From: Paul Eggert <eggert@cs.ucla.edu>
To: 11529@debbugs.gnu.org
Subject: bug#11529: redoing gnulib import to avoid 8+3 glitches
Date: Sun, 20 May 2012 20:12:53 -0700 [thread overview]
Message-ID: <4FB9B2B5.3000807@cs.ucla.edu> (raw)
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 <eggert@cs.ucla.edu>
+ 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 <eggert@cs.ucla.edu>
+ 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 <eggert@cs.ucla.edu>
+
+ 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 <eggert@cs.ucla.edu>
* 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
next reply other threads:[~2012-05-21 3:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 3:12 Paul Eggert [this message]
2012-05-21 17:56 ` bug#11529: redoing gnulib import to avoid 8+3 glitches Eli Zaretskii
2012-05-21 19:05 ` Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB9B2B5.3000807@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=11529@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.