[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: patches/hurd-i386/cvs-libpthread.diff: update



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch glibc-2.25
in repository glibc.

commit 3cd4802f56cef4a8e0ed49100bb94a5031b5addb
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Aug 2 23:45:09 2017 +0000

    patches/hurd-i386/cvs-libpthread.diff: update
---
 debian/changelog                             |  1 +
 debian/patches/hurd-i386/cvs-libpthread.diff | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2169f0..058ac7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ glibc (2.25-0experimental1) UNRELEASED; urgency=medium
   * patches/hurd-i386/submitted-malloc-setstate.diff: update.
   * patches/hurd-i386/submitted-shm_open_pthread.diff: new patch.
   * patches/hurd-i386/cvs-libc_init_secure.diff: new patch.
+  * patches/hurd-i386/cvs-libpthread.diff: update.
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 02 Aug 2017 19:03:14 +0200
 
diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff
index 78ed30a..a32912a 100644
--- a/debian/patches/hurd-i386/cvs-libpthread.diff
+++ b/debian/patches/hurd-i386/cvs-libpthread.diff
@@ -1,7 +1,7 @@
-git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ 44873df420d128972644ef3901c7d917ca3b7dd7
+git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ 3142d0ded19ebd164d1ac90ee5850ed281812446
 from git.savannah.gnu.org:/srv/git/hurd/libpthread.git/
 thus by construction only libpthread/ files, thus hurd-only
-Date:   Tue Nov 1 15:13:47 2016 +0100
+Date:   Thu Aug 3 01:42:38 2017 +0200
 
  ChangeLog                                     |   6 +
  Makeconfig                                    |  13 +
@@ -252,7 +252,7 @@ new file mode 100644
 index 0000000..e90f5f7
 --- /dev/null
 +++ glibc/libpthread/Makeconfig
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,20 @@
 +# Makeconfig fragment for Hurd libpthread add-on.
 +# This gets included at the end of the main glibc Makeconfig.
 +
@@ -263,6 +263,13 @@ index 0000000..e90f5f7
 +static-thread-library = $(common-objpfx)libpthread/libpthread.a
 +bounded-thread-library = $(static-thread-library)
 +
++ifeq ($(subdir),malloc)
++LDLIBS-tst-interpose-static-thread += -lihash
++endif
++ifeq ($(subdir),elf)
++LDLIBS-tst-linkall-static += -lihash
++endif
++
 +rpath-dirs += libpthread
 +
 ++includes += -I$(..)libpthread/include

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: