[glibc] 01/01: Merge branch 'sid' into glibc-2.26
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.26
in repository glibc.
commit 113e123e8f753ca2aa839beb56552f32767706e3
Merge: e86818f 59916fc
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Nov 18 12:04:17 2017 +0100
Merge branch 'sid' into glibc-2.26
debian/changelog | 42 +++++++++++++++++++++++++++++--------
debian/debhelper.in/libc.postinst | 4 ++--
debian/po/de.po | 15 +++++--------
debian/po/pt.po | 44 +++++++++++++++++++++------------------
debian/rules | 5 +++--
debian/rules.d/debhelper.mk | 2 +-
debian/script.in/nohwcap.sh | 2 +-
debian/script.in/nsscheck.sh | 1 +
debian/sysdeps/alpha.mk | 2 ++
debian/sysdeps/amd64.mk | 9 ++++++--
debian/sysdeps/armel.mk | 7 ++++++-
debian/sysdeps/armhf.mk | 7 ++++++-
debian/sysdeps/hurd-i386.mk | 2 +-
debian/sysdeps/i386.mk | 25 +++++++++++++---------
debian/sysdeps/kfreebsd-amd64.mk | 7 ++++++-
debian/sysdeps/mips.mk | 9 ++++++--
debian/sysdeps/mips64.mk | 9 ++++++--
debian/sysdeps/mips64el.mk | 9 ++++++--
debian/sysdeps/mipsel.mk | 9 ++++++--
debian/sysdeps/mipsn32.mk | 9 ++++++--
debian/sysdeps/mipsn32el.mk | 9 ++++++--
debian/sysdeps/powerpc.mk | 6 +++++-
debian/sysdeps/ppc64.mk | 7 ++++++-
debian/sysdeps/s390x.mk | 7 ++++++-
debian/sysdeps/sparc.mk | 7 ++++++-
debian/sysdeps/sparc64.mk | 7 ++++++-
debian/sysdeps/x32.mk | 9 ++++++--
27 files changed, 191 insertions(+), 80 deletions(-)
diff --cc debian/changelog
index b4a3769,2511689..9ed3c70
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,116 -1,12 +1,120 @@@
+glibc (2.26-0experimental0) UNRELEASED; urgency=medium
+
+ [ Adam Conrad ]
+ * New upstream release (LP: #1703368), with git updates to 2017-10-10:
+ - debian/{symbols.wildcards,control}: Update and regen for 2.26.
+ - debian/patches/alpha/submitted-termios_h.diff: upstreamed.
+ - debian/patches/arm/submitted-strip-bit-0.diff: upstreamed.
+ - debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff: upstreamed.
+ - debian/patches/any/submitted-string2-strcmp.diff: obsolete.
+ - debian/patches/any/local-tst-writev.diff: fixed upstream.
+ - debian/patches/any/local-dynamic-resolvconf.diff: fixed upstream.
+ - debian/patches/any/submitted-unicode-9.0.0.diff: obsolete.
+ - debian/patches/any/cvs-malloc-hardening.diff: upstreamed.
+ - debian/patches/any/local-bits-sigstack.diff: fixed upstream.
+ - debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: upstreamed.
+ - debian/patches/i386/local-cmov.diff: dropped, no longer useful.
+ - debian/patches/all/local-ldd.diff: rebased.
+ - debian/patches/any/local-ldso-disable-hwcap.diff: rebased.
+ - debian/patches/any/local-tcsetaddr.diff: rebased.
+ - debian/patches/any/submitted-resolv-unaligned.diff: rebased.
+ - debian/patches/arm/local-arm-futex.diff: rebased.
+ - debian/patches/hurd-i386/local-ED.diff: rebased.
+ - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: rebased.
+ - debian/patches/hurd-i386/tg-EIEIO-fr.diff: rebased.
+ - debian/patches/kfreebsd/submitted-auxv.diff: rebased.
+ - debian/patches/kfreebsd/submitted-waitid.diff: rebased.
+ - debian/patches/localedata/locales-fr.diff: rebased.
+ - debian/patches/sparc/submitted-sparc64-socketcall.diff: rebased.
+ - debian/patches/localedata/local-hu_HU-sort.diff: Make testsuite
+ agree with the sorting we see in Debian, may need another look.
+ - debian/patches/any/local-cudacc-float128.diff: Local patch to prevent
+ defining __HAVE_FLOAT128 on NVIDIA's CUDA compilers (LP: #1717257)
+ - debian/patches/arm/git-arm64-memcmp.diff: Backport optimized memcmp
+ for AArch64, improving performance from 25% to 500% (LP: #1720832)
+ - debian/patches/amd64/git-x86_64-search.diff: Backport upstream commit
+ to put x86_64 back in the search path, like in 2.25 (LP: #1718928)
+ - debian/control.in/libc: Drop ancient Breaks satisfied in oldoldstable.
+ - debian/{debhelper.in/libc.preinst,sysdeps/amd64.mk,sysdeps/i386.mk}:
+ Bump MIN_KERNEL_SUPPORTED to 3.2 on x86, following upstream's change.
- - debian/sysdeps/{powerpc.mk,ppc64.mk,ppc64el.mk,s390x.mk}: Disable
- lock-elision on powerpc and s390, following IBM's recommendation,
- and fixing testsuite regressions on (at least) ppc64el in the process.
++ - debian/sysdeps/{powerpc.mk,ppc64.mk,s390x.mk}: Disable lock-elision on
++ on powerpc and s390, following IBM's recommendation.
+ - debian/testsuite-xfail-debian.mk: Re-enable xfailed resolv tests.
+ - debian/testsuite-xfail-debian.mk: Allow tst-create-detached to fail on
+ all platforms; the design of this test is such that the outcome relies
+ on cache sizes and noisiness of the build system, which is unreliable.
+ - debian/testsuite-xfail-debian.mk: Use granular pow/setpayloadsig xfails.
+ - debian/rules.d/build.mk: Configure with --enable-obsolete-nsl until we
+ sort out a reasonable nsswitch migration strategy from compat to files.
+
- [ Matthias Klose ]
- * debian/rules.d/debhelper.mk: Filter python hooks in stage1 (closes: #874491)
-
+ [ Samuel Thibault ]
+ * Adjust hurd-i386 patches to restore build and functionality with 2.26:
+ - patches/hurd-i386/tg-gsync-libc.diff: rebased.
+ - patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased.
+ - patches/hurd-i386/tg-pipe2.diff: rebased.
+ - patches/hurd-i386/tg-socket_flags.diff: rebased.
+ - patches/hurd-i386/tg2.25-tls.diff: rebased.
+ - patches/hurd-i386/tg2.26-sched_param.diff: New patch.
+ - patches/hurd-i386/git-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-2.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-3.h.diff: New patch.
+ - patches/hurd-i386/tg2.26-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-bits_socket.h.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-3.diff: New patch.
+ - patches/hurd-i386/git-rtld-access.diff: New patch.
+ - patches/hurd-i386/git-rtld-sbrk.diff: New patch.
+ - patches/hurd-i386/git-rtld-sbrk-2.diff: New patch.
+ - patches/hurd-i386/git-divdi.diff: New patch.
+ - patches/hurd-i386/git-feraiseexcept.diff: New patch.
+ - patches/hurd-i386/cvs-libpthread.diff: Update.
+ - patches/hurd-i386/git-libpthread-2.26.diff: New patch.
+ - patches/hurd-i386/git-i386-implies-x86.diff: New patch.
+ - patches/hurd-i386/git-x86-tunables.diff: New patch.
+ - patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
+ - patches/hurd-i386/git-clone.diff: New patch.
+ - patches/hurd-i386/git-gethostname.diff: New patch.
+ - patches/hurd-i386/cvs-libpthread-sigstate.diff: Remove unused merged
+ patch.
+ - patches/hurd-i386/cvs-send-recv-posix.diff: Remove unused merged patch.
+ - patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch.
+ - patches/hurd-i386/git-tst-udp-timeout.diff: New patch.
+ - patches/hurd-i386/git-tst-udp-nonblocking.diff: New patch.
+ - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: New patch.
+ - patches/hurd-i386/git-hidden-def.diff: New patch.
+ - patches/hurd-i386/git-hidden-def.diff-2: New patch.
+ - patches/hurd-i386/git-dl-sysdep-check.diff: New patch.
+ - patches/hurd-i386/git-socket-limit.diff: New patch.
+ - patches/hurd-i386/tg-thread-linkspace.diff: New patch.
+ - patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
+ - patches/hurd-i386/tg-gsync-libc.diff: Update.
+ - patches/hurd-i386/tg-libpthread-gsync-mutex.diff: Update.
+ - patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff: Update.
+ - patches/hurd-i386/git-sigsuspend_not_cancel.diff: New patch.
+ - patches/hurd-i386/tg-sysvshm.diff: Update.
+ - patches/hurd-i386/tg-ifaddrs_v6.diff: Update.
+ - patches/hurd-i386/git-dirfd-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-revoke-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-seekdir-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-ifaddrs-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-NO_HIDDEN.diff: New patch.
+ - patches/hurd-i386/unsubmitted-NO_HIDDEN.diff: Remove patch.
+ - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: Remove patch.
+ - testsuite-xfail-debian.mk: Update.
+ - testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
+
+ -- Adam Conrad <adconrad@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600
+
- glibc (2.25-0experimental4) UNRELEASED; urgency=medium
+ glibc (2.25-1) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/rules.d/debhelper.mk: relax the dependency on linux-libc-dev
+ to the major upstream version.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 18 Nov 2017 10:13:37 +0100
+
+ glibc (2.25-0experimental4) experimental; urgency=medium
[ Samuel Thibault ]
* patches/hurd-i386/git-bits-sysmacros.h.diff: New patch.
diff --cc debian/sysdeps/i386.mk
index 9be69b0,bd8d6f6..9143d3e
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@@ -1,6 -1,8 +1,7 @@@
# configuration options for all flavours
extra_config_options = --enable-multi-arch
-MIN_KERNEL_SUPPORTED := 2.6.32
+ ifeq (,$(filter stage1 stage2, $(DEB_BUILD_PROFILES)))
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
diff --cc debian/sysdeps/powerpc.mk
index 9a07d43,cca0fd8..3147501
--- a/debian/sysdeps/powerpc.mk
+++ b/debian/sysdeps/powerpc.mk
@@@ -1,8 -1,11 +1,11 @@@
# configuration options for all flavours
-extra_config_options = --enable-multi-arch --enable-lock-elision
+extra_config_options = --enable-multi-arch
+ # multilib flavours
+ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit (ppc64) alternative library
- GLIBC_MULTILIB_PASSES += ppc64
+ GLIBC_PASSES += ppc64
DEB_ARCH_MULTILIB_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: