This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch glibc-2.25 in repository glibc.
commit 824f208a66b42f959c4069255ba0c1bc34565053 Author: Aurelien Jarno <aurel...@aurel32.net> Date: Sun Aug 20 23:50:47 2017 +0200 * debian/control.in/main: build-depends on autotools-dev. * debian/rules, debian/rules.d/build.mk: update/restore config.guess and config.sub on configure/clean. --- debian/changelog | 3 +++ debian/control | 2 +- debian/control.in/main | 2 +- debian/rules | 1 + debian/rules.d/build.mk | 7 ++++++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fda815..9e7ae6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ glibc (2.25-0experimental2) UNRELEASED; urgency=medium [ Aurelien Jarno ] * Do not try to install NPTL GDB pretty-printers on non-Linux. + * debian/control.in/main: build-depends on autotools-dev. + * debian/rules, debian/rules.d/build.mk: update/restore config.guess and + config.sub on configure/clean. -- Aurelien Jarno <aure...@debian.org> Sun, 20 Aug 2017 19:05:48 +0200 diff --git a/debian/control b/debian/control index 45f5132..161d11d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: glibc Section: libs Priority: required Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt, - autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, + autoconf, autotools-dev, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, linux-libc-dev (>= 3.9) [linux-any], libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any], mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386], diff --git a/debian/control.in/main b/debian/control.in/main index 27e1c84..8f0ba0b 100644 --- a/debian/control.in/main +++ b/debian/control.in/main @@ -2,7 +2,7 @@ Source: glibc Section: libs Priority: required Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt, - autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, + autoconf, autotools-dev, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, linux-libc-dev (>= 3.9) [linux-any], libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any], mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386], diff --git a/debian/rules b/debian/rules index a7a6ed1..1ac9d1a 100755 --- a/debian/rules +++ b/debian/rules @@ -197,6 +197,7 @@ endif include debian/rules.d/*.mk clean:: unpatch + dh_autotools-dev_restoreconfig rm -f $(CURDIR)/po/*.mo rm -rf $(patsubst %,debian/tmp-%,$(GLIBC_PASSES)) rm -rf $(build-tree) diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk index c7003dc..737de51 100644 --- a/debian/rules.d/build.mk +++ b/debian/rules.d/build.mk @@ -20,6 +20,11 @@ ifdef WITH_SYSROOT libc_extra_config_options += --with-headers=$(WITH_SYSROOT)/$(includedir) endif +$(stamp)config_sub_guess: $(stamp)patch + @echo Updating config.sub and config.guess + dh_autotools-dev_updateconfig + touch $@ + $(patsubst %,mkbuilddir_%,$(GLIBC_PASSES)) :: mkbuilddir_% : $(stamp)mkbuilddir_% $(stamp)mkbuilddir_%: $(stamp)patch $(KERNEL_HEADER_DIR) @echo Making builddir for $(curpass) @@ -27,7 +32,7 @@ $(stamp)mkbuilddir_%: $(stamp)patch $(KERNEL_HEADER_DIR) touch $@ $(patsubst %,configure_%,$(GLIBC_PASSES)) :: configure_% : $(stamp)configure_% -$(stamp)configure_%: $(stamp)mkbuilddir_% +$(stamp)configure_%: $(stamp)config_sub_guess $(stamp)mkbuilddir_% @echo Configuring $(curpass) rm -f $(DEB_BUILDDIR)/configparms echo "MIG = $(call xx,MIG)" >> $(DEB_BUILDDIR)/configparms -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git