mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-24 10:54:42 +08:00
Resync from gnulib.
* cfg.mk (cvs_executable_files, cvs_files): Rewrite... (fetch): ...into new target. (executable-update): Delete, now that it is unused. * maint.mk (update, local_updates, cvs_files, gnulib_repo) (wget-update, cvs-update): Likewise. * HACKING (Update the foreign files): Document new procedure. * GNUmakefile: Resync from upstream, via new 'make fetch'. * build-aux/config.guess: Likewise. Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake
parent
734abde3de
commit
5e7bc716e5
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2008-10-08 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Resync from gnulib.
|
||||
* cfg.mk (cvs_executable_files, cvs_files): Rewrite...
|
||||
(fetch): ...into new target.
|
||||
(executable-update): Delete, now that it is unused.
|
||||
* maint.mk (update, local_updates, cvs_files, gnulib_repo)
|
||||
(wget-update, cvs-update): Likewise.
|
||||
* HACKING (Update the foreign files): Document new procedure.
|
||||
* GNUmakefile: Resync from upstream, via new 'make fetch'.
|
||||
* build-aux/config.guess: Likewise.
|
||||
|
||||
2008-09-18 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* lib/m4sugar/m4sh.m4 (_AS_SHELL_FN_SPY): Remove.
|
||||
|
||||
10
GNUmakefile
10
GNUmakefile
@ -71,17 +71,21 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
|
||||
# warn when installing a version string that is out of date; the user
|
||||
# should run 'autoreconf' (or something like 'make distcheck') to
|
||||
# fix the version, 'make all' to propagate it, then 'make install'.
|
||||
$(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it)
|
||||
$(info WARNING: version string $(VERSION) is out of date;)
|
||||
$(info run '$(MAKE) version' to fix it)
|
||||
else
|
||||
$(info INFO: running autoreconf for new version string: $(_curr-ver))
|
||||
_dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
|
||||
&& $(_autoreconf))
|
||||
_dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) version)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: version
|
||||
version:
|
||||
cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf)
|
||||
|
||||
else
|
||||
|
||||
.DEFAULT_GOAL := abort-due-to-no-makefile
|
||||
|
||||
6
HACKING
6
HACKING
@ -101,10 +101,8 @@ environment, such as your GPG key and the location of a gnulib
|
||||
checkout.
|
||||
|
||||
** Update the foreign files
|
||||
Running `make update' in the top level should make it all for you.
|
||||
FIXME - this is broken as of 2.62, now that most upstream files are
|
||||
stored in git rather than CVS. Until this is fixed, manually copy the
|
||||
files listed in cfg.mk from a gnulib git checkout.
|
||||
Running `make fetch' in the top level should grab it all for you; you
|
||||
should check the results before committing them in git.
|
||||
|
||||
** Set the version number
|
||||
Update the version number in NEWS (with version, date, and release
|
||||
|
||||
7
build-aux/config.guess
vendored
7
build-aux/config.guess
vendored
@ -4,7 +4,7 @@
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2008-04-14'
|
||||
timestamp='2008-09-28'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@ -796,7 +796,7 @@ EOF
|
||||
x86)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T | authenticamd)
|
||||
EM64T | authenticamd | genuineintel)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
IA64)
|
||||
@ -935,6 +935,9 @@ EOF
|
||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||
exit ;;
|
||||
padre:Linux:*:*)
|
||||
echo sparc-unknown-linux-gnu
|
||||
exit ;;
|
||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||
# Look for CPU level
|
||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||
|
||||
51
cfg.mk
51
cfg.mk
@ -38,42 +38,33 @@ url_dir_list = \
|
||||
# The GnuPG ID of the key used to sign the tarballs.
|
||||
gpg_key_ID = F4850180
|
||||
|
||||
# Files to update automatically.
|
||||
cvs_executable_files = \
|
||||
$(srcdir)/build-aux/announce-gen \
|
||||
$(srcdir)/build-aux/config.guess \
|
||||
$(srcdir)/build-aux/config.sub \
|
||||
$(srcdir)/build-aux/elisp-comp \
|
||||
$(srcdir)/build-aux/git-version-gen \
|
||||
$(srcdir)/build-aux/gnupload \
|
||||
$(srcdir)/build-aux/install-sh \
|
||||
$(srcdir)/build-aux/mdate-sh \
|
||||
$(srcdir)/build-aux/missing \
|
||||
$(srcdir)/build-aux/vc-list-files
|
||||
# The local directory containing the checked-out copy of gnulib used in this
|
||||
# release.
|
||||
gnulib_dir = '$(abs_srcdir)'/../gnulib
|
||||
|
||||
cvs_files = $(cvs_executable_files) \
|
||||
$(srcdir)/build-aux/texinfo.tex \
|
||||
$(srcdir)/doc/fdl.texi \
|
||||
$(srcdir)/doc/make-stds.texi \
|
||||
$(srcdir)/doc/standards.texi \
|
||||
$(srcdir)/GNUmakefile
|
||||
|
||||
# Keep executables executable. Make it robust to parallel makes.
|
||||
local_updates = executable-update
|
||||
|
||||
.PHONY: executable-update
|
||||
# autom4te-update is defined in Makefile.am.
|
||||
executable-update: wget-update cvs-update autom4te-update
|
||||
chmod a+x $(cvs_executable_files)
|
||||
# Update files from gnulib.
|
||||
.PHONY: fetch
|
||||
fetch:
|
||||
cp $(gnulib_dir)/build-aux/announce-gen $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/config.guess $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/config.sub $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/elisp-comp $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/git-version-gen $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/gnupload $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/install-sh $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/mdate-sh $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/missing $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
|
||||
cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc
|
||||
cp $(gnulib_dir)/top/GNUmakefile $(srcdir)
|
||||
|
||||
# Tests not to run.
|
||||
local-checks-to-skip ?= \
|
||||
changelog-check sc_unmarked_diagnostics
|
||||
|
||||
# The local directory containing the checked-out copy of gnulib used in this
|
||||
# release. For now, used solely for generating the web-manual.
|
||||
gnulib_dir = '$(abs_srcdir)'/../gnulib
|
||||
|
||||
.PHONY: web-manual
|
||||
web-manual:
|
||||
@cd $(srcdir)/doc ; \
|
||||
|
||||
38
maint.mk
38
maint.mk
@ -549,44 +549,6 @@ www-gnu = http://www.gnu.org
|
||||
# Use mv, if you don't have/want move-if-change.
|
||||
move_if_change ?= move-if-change
|
||||
|
||||
|
||||
# --------------------- #
|
||||
# Updating everything. #
|
||||
# --------------------- #
|
||||
|
||||
.PHONY: update
|
||||
local_updates ?= cvs-update
|
||||
update: $(local_updates)
|
||||
|
||||
|
||||
# -------------------------- #
|
||||
# Updating GNU build tools. #
|
||||
# -------------------------- #
|
||||
|
||||
cvs_files ?= \
|
||||
$(srcdir)/build-aux/depcomp \
|
||||
$(srcdir)/build-aux/install-sh \
|
||||
$(srcdir)/build-aux/missing
|
||||
gnulib_repo=:pserver:anonymous@cvs.savannah.gnu.org:/sources/gnulib
|
||||
.PHONY: wget-update
|
||||
wget-update: $(get-targets)
|
||||
|
||||
.PHONY: cvs-update
|
||||
cvs-update:
|
||||
fail=; \
|
||||
for f in $(cvs_files) dummy; do \
|
||||
test $$f = dummy && continue; \
|
||||
test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \
|
||||
cvs diff $$f > /dev/null \
|
||||
|| { echo "*** $$f is locally modified; skipping it" 1>&2; \
|
||||
fail=yes; continue; }; \
|
||||
file=$$(expr "X$$f" : 'X$(srcdir)/\(.*\)'); \
|
||||
echo checking out $$file...; \
|
||||
$(CVS) -d $(gnulib_repo) co -p gnulib/$$file >$$f.t \
|
||||
&& $(move_if_change) $$f.t $$f; \
|
||||
done; \
|
||||
test "$$fail" && exit 1
|
||||
|
||||
emit_upload_commands:
|
||||
@echo =====================================
|
||||
@echo =====================================
|
||||
|
||||
Loading…
Reference in New Issue
Block a user