[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4-20-g2f907f6
|
From: |
Ralf Wildenhues |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4-20-g2f907f6 |
|
Date: |
Fri, 15 Oct 2010 03:59:46 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via 2f907f634e7035166a793fd70e40ae677c2a9a10 (commit)
via a2bb0c980f2b50ab31fedd18bb4890843b3d399a (commit)
via c9497cc81cc46ce8848452240a323266440c4cb9 (commit)
via dd5b4f06557a4c5ec7b06d7814b95ecd63ab63b8 (commit)
from 3b0fd490f391c88f84ba461c8cf28bd38eab3df0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2f907f634e7035166a793fd70e40ae677c2a9a10
Merge: 3b0fd49 a2bb0c9
Author: Ralf Wildenhues <address@hidden>
Date: Fri Oct 15 05:54:45 2010 +0200
Merge branch 'libtool-next' (early part)
* 'libtool-next' (early part):
libtool: remove redundant unsubstituted shell var defaults.
maint: don't leak developer GREP, SED etc into distribution file.
maint: rearrange Makefile.am in preparation for a follow-up patch.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 36 +++++++++++
HACKING | 9 ---
Makefile.am | 190 ++++++++++++++++++++++++++++++----------------------------
NEWS | 2 +
4 files changed, 136 insertions(+), 101 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fbd8386..df41497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2010-10-15 Gary V. Vaughan <address@hidden>
+
+ libtool: remove redundant unsubstituted shell var defaults.
+ * Makefile.am (libltdl/config/ltmain.sh): Boilerplate code from
+ libltdl/config/general.m4 sets some default shell variables
+ designed to be substituted by `$(configure_edit)'. Actually,
+ `libtool' uses the language tag values for those variables, and
+ `ltmain.m4sh' is not passed through `$(configure_edit)', so they
+ are just noise. Edit them out at bootstrap time.
+
+2010-10-15 Gary V. Vaughan <address@hidden>
+
+ maint: don't leak developer GREP, SED etc into distribution file.
+ * Makefile.am: Having rearranged the file, now apply the actual
+ changes to follow-up.
+ (edit): Split into two parts...
+ (bootstrap_edit): ...substitutions that should happen at bootstrap
+ time...
+ (configure_edit): ...and substitutions that should not happen until
+ configure time.
+ * Makefile.am (libltdl/m4/ltversion.m4, libltdl/config/ltmain.sh)
+ (libtoolize.in, tests/package.m4): Use bootstrap_edit.
+ (libtoolize, tests/defs): Use configure_edit.
+ * HACKING (Release Procedure): Remove the note to workaround the
+ bug fixed by this changeset.
+ * NEWS (Bug fixes): Mention that this bug is now fixed.
+ Reported by Joerg Sonnenberger.
+
+ maint: rearrange Makefile.am in preparation for a follow-up patch.
+ * Makefile.am (Libtool scripts.): Move this section below the
+ `Bootstrap.' section...
+ (libtoolize.in): ...except this one which is generated at
+ bootstrap time, and was added into the `Bootstrap.' section.
+ (Libltdl.): Move this section below the `Libtool scripts.'
+ section.
+
2010-10-15 Ralf Wildenhues <address@hidden>
Fix linking from only convenience archives with gfortran on Darwin.
diff --git a/HACKING b/HACKING
index 977be10..b17de29 100644
--- a/HACKING
+++ b/HACKING
@@ -619,15 +619,6 @@ or obtained by writing to the Free Software Foundation,
Inc.,
* Update NEWS, ChangeLog.
-* Until the bug that leaks developer tool paths into the release tarballs
- from ./bootstrap is fixed, make sure the right tools are first in your
- PATH and then:
- export EGREP=egrep
- export FGREP=fgrep
- export GREP=grep
- export MAKE=make
- export SED=sed
-
* Run ./bootstrap.
* Run ./configure (or create a build directory first and run configure
diff --git a/Makefile.am b/Makefile.am
index 6c23a5e..db2c0a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,84 +60,10 @@ timestamp = set dummy `$(MKSTAMP) $(srcdir)`; shift; \
rebuild = rebuild=:; $(timestamp); correctver=$$1
-## ---------------- ##
-## Libtool scripts. ##
-## ---------------- ##
-
-# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
-
-libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
- rm -f libtoolize.tmp libtoolize
- $(timestamp); \
- $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
- -e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
- -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
- -e "s,@pkgconfig_files\@,$(auxfiles),g" \
- $(srcdir)/libtoolize.in > libtoolize.tmp
- chmod a+x libtoolize.tmp
- chmod a-w libtoolize.tmp
- mv -f libtoolize.tmp libtoolize
-
-# Use `$(srcdir)' for the benefit of non-GNU makes: this is
-# how libtoolize.in appears in our dependencies.
-EXTRA_DIST += libtoolize.m4sh
-$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
- cd $(srcdir); \
- rm -f libtoolize.in; \
- $(M4SH) -B $(auxdir) libtoolize.m4sh > libtoolize.in
-
-# We used to do this with a 'stamp-vcl' file, but non-gmake builds
-# would rerun configure on every invocation, so now we manually
-# check the version numbers from the build rule when necessary.
-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
- @target=libtool; $(rebuild); \
- if test -f "$$target"; then \
- set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
- test "$$actualver" = "$$correctver" && rebuild=false; \
- fi; \
- for prereq in $?; do \
- case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
- done; \
- if $$rebuild; then \
- echo $(SHELL) ./config.status $$target; \
- cd $(top_builddir) && $(SHELL) ./config.status $$target; \
- fi
-
-.PHONY: configure-subdirs
-configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
address@hidden@:
- dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
- test -d $$dir || mkdir $$dir || exit 1; \
- abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; \
- (cd $$dir && $$abs_srcdir/$$dir/configure --with-dist) || exit 1
-
-
# ---------- #
# Bootstrap. #
# ---------- #
-edit = sed \
- -e 's,@EGREP\@,$(EGREP),g' \
- -e 's,@FGREP\@,$(FGREP),g' \
- -e 's,@GREP\@,$(GREP),g' \
- -e 's,@LN_S\@,$(LN_S),g' \
- -e 's,@MACRO_VERSION\@,$(VERSION),g' \
- -e 's,@PACKAGE\@,$(PACKAGE),g' \
- -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
- -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
- -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
- -e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
- -e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
- -e 's,@SED\@,$(SED),g' \
- -e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@aclocaldir\@,$(aclocaldir),g' \
- -e 's,@datadir\@,$(datadir),g' \
- -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e 's,@host_triplet\@,$(host_triplet),g' \
- -e 's,@prefix\@,$(prefix),g'
-
sh_files = $(auxdir)/general.m4sh $(auxdir)/getopt.m4sh
EXTRA_DIST += bootstrap $(srcdir)/libtoolize.in $(auxdir)/ltmain.m4sh \
$(auxdir)/mkstamp $(sh_files) \
@@ -149,6 +75,24 @@ EXTRA_DIST += bootstrap $(srcdir)/libtoolize.in
$(auxdir)/ltmain.m4sh \
CLEANFILES += libtool libtoolize libtoolize.tmp \
$(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
+## These are the replacements that need to be made at bootstrap time,
+## because they must be static in distributed files, and not accidentally
+## changed by configure running on the build machine.
+bootstrap_edit = sed \
+ -e 's,@MACRO_VERSION\@,$(VERSION),g' \
+ -e "s,@MACRO_REVISION\@,$$correctver,g" \
+ -e "s,@MACRO_SERIAL\@,$$serial,g" \
+ -e 's,@PACKAGE\@,$(PACKAGE),g' \
+ -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ -e "s,@package_revision\@,$$correctver,g" \
+ -e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
+ -e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
+ -e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
+ -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
+ -e 's,@VERSION\@,$(VERSION),g'
+
## We build ltversion.m4 here, instead of from config.status,
## because config.status is rerun each time one of configure's
## dependencies change and ltversion.m4 happens to be a configure
@@ -174,11 +118,9 @@ $(srcdir)/$(m4dir)/ltversion.m4: $(m4dir)/ltversion.in
configure.ac ChangeLog
cd $(srcdir); \
rm -f $(m4dir)/ltversion.tmp; \
serial=`echo "$$correctver" | sed 's,^1[.],,g'`; \
- echo $(edit) -e "s,@MACRO_REVISION\@,$$correctver,g" \
- -e "s,@MACRO_SERIAL\@,$$serial,g" \
+ echo $(bootstrap_edit) \
$(srcdir)/$(m4dir)/ltversion.in \> $(srcdir)/$(m4dir)/ltversion.m4;
\
- $(edit) -e "s,@MACRO_REVISION\@,$$correctver,g" \
- -e "s,@MACRO_SERIAL\@,$$serial,g" \
+ $(bootstrap_edit) \
$(m4dir)/ltversion.in > $(m4dir)/ltversion.tmp; \
chmod a-w $(m4dir)/ltversion.tmp; \
mv -f $(m4dir)/ltversion.tmp $(m4dir)/ltversion.m4; \
@@ -213,17 +155,25 @@ $(srcdir)/$(auxdir)/ltmain.sh: $(sh_files)
$(auxdir)/ltmain.m4sh configure.ac Ch
\> $(auxdir)/ltmain.in; \
$(M4SH) -B $(auxdir) $(auxdir)/ltmain.m4sh \
> $(auxdir)/ltmain.in; \
- echo $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
- -e "s,@package_revision\@,$$correctver," \
+ echo $(bootstrap_edit) \
$(srcdir)/$(auxdir)/ltmain.in "> $$target"; \
- $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
- -e "s,@package_revision\@,$$1,g" \
- $(auxdir)/ltmain.in > $(auxdir)/ltmain.tmp; \
+ $(bootstrap_edit) -e '/^: \$${.*="@.*@"}$$/d' \
+ $(auxdir)/ltmain.in > $(auxdir)/ltmain.tmp; \
rm -f $(auxdir)/ltmain.in; \
chmod a-w $(auxdir)/ltmain.tmp; \
mv -f $(auxdir)/ltmain.tmp $(auxdir)/ltmain.sh; \
fi
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how libtoolize.in appears in our dependencies.
+EXTRA_DIST += libtoolize.m4sh
+$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
+ cd $(srcdir); \
+ rm -f libtoolize.in libtoolize.tmp; \
+ $(M4SH) -B $(auxdir) libtoolize.m4sh > libtoolize.tmp; \
+ $(bootstrap_edit) libtoolize.tmp > libtoolize.in; \
+ rm -f libtoolize.tmp
+
$(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
cd $(srcdir); \
in=libltdl/Makefile.inc; out=libltdl/Makefile.am; \
@@ -260,6 +210,69 @@ LTDL_BOOTSTRAP_DEPS = $(srcdir)/libltdl/aclocal.m4 \
all-local: $(LTDL_BOOTSTRAP_DEPS)
+
+## ---------------- ##
+## Libtool scripts. ##
+## ---------------- ##
+
+configure_edit = sed \
+ -e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
+ -e 's,@aclocaldir\@,$(aclocaldir),g' \
+ -e 's,@datadir\@,$(datadir),g' \
+ -e 's,@EGREP\@,$(EGREP),g' \
+ -e 's,@FGREP\@,$(FGREP),g' \
+ -e 's,@GREP\@,$(GREP),g' \
+ -e 's,@host_triplet\@,$(host_triplet),g' \
+ -e 's,@LN_S\@,$(LN_S),g' \
+ -e "s,@pkgconfig_files\@,$(auxfiles),g" \
+ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+ -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
+ -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@SED\@,$(SED),g'
+
+# The libtool distributor and the standalone libtool script.
+bin_SCRIPTS = libtoolize libtool
+
+libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
+ rm -f libtoolize.tmp libtoolize
+ $(configure_edit) \
+ $(srcdir)/libtoolize.in > libtoolize.tmp
+ chmod a+x libtoolize.tmp
+ chmod a-w libtoolize.tmp
+ mv -f libtoolize.tmp libtoolize
+
+# We used to do this with a 'stamp-vcl' file, but non-gmake builds
+# would rerun configure on every invocation, so now we manually
+# check the version numbers from the build rule when necessary.
+libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
+ @target=libtool; $(rebuild); \
+ if test -f "$$target"; then \
+ set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
+ test "$$actualver" = "$$correctver" && rebuild=false; \
+ fi; \
+ for prereq in $?; do \
+ case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
+ done; \
+ if $$rebuild; then \
+ echo $(SHELL) ./config.status $$target; \
+ cd $(top_builddir) && $(SHELL) ./config.status $$target; \
+ fi
+
+.PHONY: configure-subdirs
+configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
address@hidden@:
+ dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
+ test -d $$dir || mkdir $$dir || exit 1; \
+ abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; \
+ (cd $$dir && $$abs_srcdir/$$dir/configure --with-dist) || exit 1
+
+
+## -------- ##
+## Libltdl. ##
+## -------- ##
+
+include libltdl/Makefile.inc
+
EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
@@ -297,13 +310,6 @@ $(srcdir)/libltdl/config-h.in: $(sub_configure_deps)
touch $@
-## -------- ##
-## Libltdl. ##
-## -------- ##
-
-include libltdl/Makefile.inc
-
-
## -------------- ##
## Documentation. ##
## -------------- ##
@@ -553,7 +559,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.ac
Makefile.am
echo 'm4_define([AT_PACKAGE_STRING], address@hidden@])'; \
echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
echo 'm4_define([AT_PACKAGE_URL], address@hidden@])'; \
- } | $(edit) > $(srcdir)/tests/package.m4
+ } | $(bootstrap_edit) > $(srcdir)/tests/package.m4
tests/atconfig: $(top_builddir)/config.status
$(SHELL) ./config.status tests/atconfig
@@ -898,7 +904,7 @@ DIST_SUBDIRS += $(CONF_SUBDIRS)
check-recursive: tests/defs
tests/defs: $(srcdir)/tests/defs.in
rm -f tests/defs.tmp tests/defs; \
- $(edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \
+ $(configure_edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \
mv -f tests/defs.tmp tests/defs
# Use `$(srcdir)/tests' for the benefit of non-GNU makes: this is
diff --git a/NEWS b/NEWS
index 90e33f7..d8d692e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ New in 2.4.2 2010-12-??: git version 2.4.1a, Libtool team:
- The generic approximation of the command line length limit (when getconf is
not available) works again. Regression introduced in v2.2.6-39-g9c3d4d8.
+ - The bug that leaked developer tool paths into the release tarballs
+ from ./bootstrap is fixed.
New in 2.4 2010-09-22: git version 2.2.11a, Libtool team:
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4-20-g2f907f6,
Ralf Wildenhues <=