From 2e31dd38853cf55fa7142c9693b011773f004732 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Sun, 27 Dec 2015 20:10:04 +0200 Subject: [PATCH] gnu: glibc-hurd: Update to 20151031. * gnu/packages/base.scm (glibc/hurd): Update to 20151031. * gnu/packages/patches/glibc-hurd-check-sysheaders.patch: Remove patch. * gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch: Likewise. * gnu/packages/patches/glibc-hurd-libs.patch: Likewise. * gnu/packages/patches/libpthread-remove-duplicate.patch: Likewise. * gnu-system.am (dist_patch_DATA): Remove them. --- gnu-system.am | 4 - gnu/packages/base.scm | 8 +- .../patches/glibc-hurd-check-sysheaders.patch | 117 --------------------- .../patches/glibc-hurd-disable-memmove-fix.patch | 29 ----- gnu/packages/patches/glibc-hurd-libs.patch | 43 -------- .../patches/libpthread-remove-duplicate.patch | 17 --- 6 files changed, 2 insertions(+), 216 deletions(-) delete mode 100644 gnu/packages/patches/glibc-hurd-check-sysheaders.patch delete mode 100644 gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch delete mode 100644 gnu/packages/patches/glibc-hurd-libs.patch delete mode 100644 gnu/packages/patches/libpthread-remove-duplicate.patch diff --git a/gnu-system.am b/gnu-system.am index 88f254c..936ea21 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -489,9 +489,6 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-locale-incompatibility.patch \ gnu/packages/patches/glibc-o-largefile.patch \ gnu/packages/patches/glibc-versioned-locpath.patch \ - gnu/packages/patches/glibc-hurd-libs.patch \ - gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch \ - gnu/packages/patches/glibc-hurd-check-sysheaders.patch \ gnu/packages/patches/gmp-arm-asm-nothumb.patch \ gnu/packages/patches/gmp-faulty-test.patch \ gnu/packages/patches/gnucash-price-quotes-perl.patch \ @@ -545,7 +542,6 @@ dist_patch_DATA = \ gnu/packages/patches/libmad-frame-length.patch \ gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/librsvg-tests.patch \ - gnu/packages/patches/libpthread-remove-duplicate.patch \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests2.patch \ gnu/packages/patches/libsndfile-CVE-2014-9496.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fc358f7..4373716 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -658,14 +658,10 @@ with the Linux kernel.") (source (origin (method url-fetch) (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-" - version "-hurd+libpthread-20150515" ".tar.gz")) + version "-hurd+libpthread-20151031" ".tar.gz")) (sha256 (base32 - "0fkmn1kfsbhyrkf1wqqvc47dl5bzflnbcggjjfp5s9c489z916zw")) - (patches (list (search-patch "glibc-hurd-libs.patch") - (search-patch "glibc-hurd-disable-memmove-fix.patch") - (search-patch "glibc-hurd-check-sysheaders.patch") - (search-patch "libpthread-remove-duplicate.patch"))))) + "1mpq4d25xplnzwhbbrjjp8bx6idybkmmvhhhj877305xgn4sgvhf")))) ;; Libc provides , which includes a bunch of Hurd and Mach headers, ;; so both should be propagated. diff --git a/gnu/packages/patches/glibc-hurd-check-sysheaders.patch b/gnu/packages/patches/glibc-hurd-check-sysheaders.patch deleted file mode 100644 index 4167b6d..0000000 --- a/gnu/packages/patches/glibc-hurd-check-sysheaders.patch +++ /dev/null @@ -1,117 +0,0 @@ -With this patch glibc takes into account the '--with-headers' argument. - -From 39b09d8cb8ee3b3ca0ca9fcd772df3fab41c02f8 Mon Sep 17 00:00:00 2001 -From: Manolis Ragkousis -Date: Fri, 14 Aug 2015 01:20:59 +0300 -Subject: [PATCH] Check sysheaders when looking for Mach and Hurd headers. - -* sysdeps/mach/configure.ac: Add sysheaders check. -* sysdeps/mach/configure: Regenerate. -* sysdeps/mach/hurd/configure.ac: Add sysheaders check. -* sysdeps/mach/hurd/configure: Regenerate. ---- - sysdeps/mach/configure | 9 +++++++++ - sysdeps/mach/configure.ac | 9 +++++++++ - sysdeps/mach/hurd/configure | 9 +++++++++ - sysdeps/mach/hurd/configure.ac | 9 +++++++++ - 4 files changed, 36 insertions(+) - -diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure -index 290a5ff..d7c102c 100644 ---- a/sysdeps/mach/configure -+++ b/sysdeps/mach/configure -@@ -165,6 +165,11 @@ fi - config_vars="$config_vars - MIG = $MIG" - -+if test -n "$sysheaders"; then -+ OLD_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES" -+fi -+ - ### Sanity checks for Mach header installation - - -@@ -553,3 +558,7 @@ if test $hurd_cv_mig_retcode = yes; then - $as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h - - fi -+ -+if test -n "$sysheaders"; then -+ CPPFLAGS=$OLD_CPPFLAGS -+fi -diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac -index 52d47e0..f972270 100644 ---- a/sysdeps/mach/configure.ac -+++ b/sysdeps/mach/configure.ac -@@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then - fi - LIBC_CONFIG_VAR([MIG], [$MIG]) - -+if test -n "$sysheaders"; then -+ OLD_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES" -+fi -+ - ### Sanity checks for Mach header installation - AC_CHECK_HEADER(mach/mach_types.h,, - [AC_MSG_ERROR([cannot find Mach headers])], -) -@@ -124,3 +129,7 @@ if test $hurd_cv_mig_retcode = yes; then - fi]) - - hurd_MIG_RETCODE -+ -+if test -n "$sysheaders"; then -+ CPPFLAGS=$OLD_CPPFLAGS -+fi -diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure -index a0f9721..4b2ad37 100644 ---- a/sysdeps/mach/hurd/configure -+++ b/sysdeps/mach/hurd/configure -@@ -17,6 +17,11 @@ case "$machine" in - ;; - esac - -+if test -n "$sysheaders"; then -+ OLD_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES" -+fi -+ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5 - $as_echo_n "checking Hurd header version... " >&6; } -@@ -50,3 +55,7 @@ $as_echo "$libc_cv_hurd_version" >&6; } - if test "x$libc_cv_hurd_version" != xok; then - as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5 - fi -+ -+if test -n "$sysheaders"; then -+ CPPFLAGS=$OLD_CPPFLAGS -+fi -diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac -index ad915a5..db783a0 100644 ---- a/sysdeps/mach/hurd/configure.ac -+++ b/sysdeps/mach/hurd/configure.ac -@@ -17,6 +17,11 @@ case "$machine" in - ;; - esac - -+if test -n "$sysheaders"; then -+ OLD_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES" -+fi -+ - AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl - AC_TRY_COMPILE(dnl - [#include ], [ -@@ -29,3 +34,7 @@ AC_TRY_COMPILE(dnl - if test "x$libc_cv_hurd_version" != xok; then - AC_MSG_ERROR(Hurd headers not installed or too old) - fi -+ -+if test -n "$sysheaders"; then -+ CPPFLAGS=$OLD_CPPFLAGS -+fi --- -2.5.0 - diff --git a/gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch b/gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch deleted file mode 100644 index 0146768..0000000 --- a/gnu/packages/patches/glibc-hurd-disable-memmove-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -We need to disable this, or else memmove will not work properly in Hurd's glibc. - -From 69f807d6a4afa43e7a596e04f22923567b235ce9 Mon Sep 17 00:00:00 2001 -From: Samuel Thibault -Date: Wed, 29 Jul 2015 10:34:01 +0200 -Subject: [PATCH] Disable the fix for now, the resulting code seems bogus - ---- - .topmsg | 11 +++++++++++ - sysdeps/mach/pagecopy.h | 3 +++ - 2 files changed, 14 insertions(+) - -diff --git a/sysdeps/mach/pagecopy.h b/sysdeps/mach/pagecopy.h -index 29b73ce..9d1f4de 100644 ---- a/sysdeps/mach/pagecopy.h -+++ b/sysdeps/mach/pagecopy.h -@@ -20,7 +20,10 @@ - - /* Threshold at which vm_copy is more efficient than well-optimized copying - by words. This parameter should be tuned as necessary. */ -+#define PAGE_THRESHOLD (16384) /* XXX Tune this. */ -+#if 0 - #define PAGE_COPY_THRESHOLD (16384) /* XXX Tune this. */ -+#endif - - #define PAGE_SIZE __vm_page_size - #define PAGE_COPY_FWD(dstp, srcp, nbytes_left, nbytes) \ --- -2.4.6 \ No newline at end of file diff --git a/gnu/packages/patches/glibc-hurd-libs.patch b/gnu/packages/patches/glibc-hurd-libs.patch deleted file mode 100644 index 2102f77..0000000 --- a/gnu/packages/patches/glibc-hurd-libs.patch +++ /dev/null @@ -1,43 +0,0 @@ -Link libmachuser and libhurduser automatically with libc, since they are -considered a standard part of the API in GNU-land. -See - ---- - Makerules | 3 +++ - 1 file changed, 3 insertions(+) ---- a/Makerules -+++ b/Makerules -@@ -1001,6 +1001,9 @@ $(inst_libdir)/libc.so: $(common-objpfx) - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ - ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \ - ) > address@hidden -+ifeq ($(patsubst gnu%,,$(config-os)),) -+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> address@hidden -+endif - mv -f address@hidden $@ - - endif - -hurd-i386 defines NO_HIDDEN, thus __GI_* versions are not available. -This was introduced by -https://sourceware.org/bugzilla/show_bug.cgi?id=15605 - -See . - ---- - symbol-hacks.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -Index: eglibc-2.18/sysdeps/generic/symbol-hacks.h -=================================================================== ---- eglibc-2.18.orig/sysdeps/generic/symbol-hacks.h 2013-06-15 17:37:04.000000000 +0000 -+++ eglibc-2.18/sysdeps/generic/symbol-hacks.h 2013-10-10 06:28:31.000000000 +0000 -@@ -1,6 +1,9 @@ - /* Some compiler optimizations may transform loops into memset/memmove - calls and without proper declaration it may generate PLT calls. */ - #if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED -+#include -+# if !defined NO_HIDDEN - asm ("memmove = __GI_memmove"); - asm ("memset = __GI_memset"); -+# endif - #endif diff --git a/gnu/packages/patches/libpthread-remove-duplicate.patch b/gnu/packages/patches/libpthread-remove-duplicate.patch deleted file mode 100644 index bd3ae5b..0000000 --- a/gnu/packages/patches/libpthread-remove-duplicate.patch +++ /dev/null @@ -1,17 +0,0 @@ -There is a definition of __libc_getspecific in libpthread that causes the -build to fail. Remove it. ---- a/libpthread/pthread/cthreads-compat.c -+++ b/libpthread/pthread/cthreads-compat.c -@@ -70,12 +70,6 @@ - return 0; - } - --void * --__libc_getspecific (cthread_key_t key) --{ -- return pthread_getspecific (key); --} -- - int - cthread_setspecific (cthread_key_t key, void *val) - { \ No newline at end of file -- 2.6.4