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

[glibc] 02/02: debian/patches/kfreebsd/local-tst-unique.diff: disable tst-unique* on GNU/kFreeBSD, as they are not supported by the FreeBSD ELF OSABI.



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

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit c01d09cb49b71f3bb91e811f991cb33b631c465d
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Mar 22 23:36:05 2016 +0100

    debian/patches/kfreebsd/local-tst-unique.diff: disable tst-unique* on GNU/kFreeBSD, as they are not supported by the FreeBSD ELF OSABI.
---
 debian/changelog                              |  2 ++
 debian/patches/kfreebsd/local-tst-unique.diff | 22 ++++++++++++++++++++++
 debian/patches/series.kfreebsd-amd64          |  1 +
 debian/patches/series.kfreebsd-i386           |  1 +
 4 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 14a144e..43deb5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
     glibc-bsd).
   * debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by
     hurd-i386/cvs-libpthread.so.diff.
+  * debian/patches/kfreebsd/local-tst-unique.diff: disable tst-unique* on
+    GNU/kFreeBSD, as they are not supported by the FreeBSD ELF OSABI.
 
   [ Samuel Thibault ]
   * hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
diff --git a/debian/patches/kfreebsd/local-tst-unique.diff b/debian/patches/kfreebsd/local-tst-unique.diff
new file mode 100644
index 0000000..e68b09a
--- /dev/null
+++ b/debian/patches/kfreebsd/local-tst-unique.diff
@@ -0,0 +1,22 @@
+tst-unique is not supported by the FreeBSD ELF OSABI
+
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -145,7 +145,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
+ 	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
+ 	 tst-audit1 tst-audit2 tst-audit8 tst-audit9 \
+ 	 tst-stackguard1 tst-addr1 tst-thrlock \
+-	 tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4 \
++	 $(if $(CXX),tst-unique3 tst-unique4 \
+ 	 tst-nodelete) \
+ 	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
+ 	 tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \
+@@ -207,8 +207,6 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
+ 		unload7mod1 unload7mod2 \
+ 		unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
+ 		order2mod1 order2mod2 order2mod3 order2mod4 \
+-		tst-unique1mod1 tst-unique1mod2 \
+-		tst-unique2mod1 tst-unique2mod2 \
+ 		tst-auditmod9a tst-auditmod9b \
+ 		$(if $(CXX),tst-unique3lib tst-unique3lib2 tst-unique4lib \
+ 		  tst-nodelete-uniquemod tst-nodelete-rtldmod \
diff --git a/debian/patches/series.kfreebsd-amd64 b/debian/patches/series.kfreebsd-amd64
index 54c50d0..135b5e7 100644
--- a/debian/patches/series.kfreebsd-amd64
+++ b/debian/patches/series.kfreebsd-amd64
@@ -3,3 +3,4 @@ kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-initgroups-order.diff
 kfreebsd/local-tst-auxv.diff
+kfreebsd/local-tst-unique.diff
diff --git a/debian/patches/series.kfreebsd-i386 b/debian/patches/series.kfreebsd-i386
index 54c50d0..135b5e7 100644
--- a/debian/patches/series.kfreebsd-i386
+++ b/debian/patches/series.kfreebsd-i386
@@ -3,3 +3,4 @@ kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-initgroups-order.diff
 kfreebsd/local-tst-auxv.diff
+kfreebsd/local-tst-unique.diff

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


Reply to: