Author: adconrad
Date: 2013-01-23 06:16:40 +0000 (Wed, 23 Jan 2013)
New Revision: 5448
Added:
glibc-package/branches/eglibc-2.17/debian/patches/any/cvs-tst-array-as-needed.diff
Removed:
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-tst-array-as-needed.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/series
Log:
Replace unsubmitted-tst-array-as-needed.diff with cvs-tst-array-as-needed.diff
from my upstream commit
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 05:52:38 UTC
(rev 5447)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 06:16:40 UTC
(rev 5448)
@@ -62,8 +62,8 @@
* debian/debhelper.in/libc.preinst: Fix preinst kernel check to match
the reality that we need >= 2.6.32, as found in squeeze/lucid/RHEL6.
* debian/rules: Fix EGLIBC_VERSION epoch parsing breakage (LP: #929565)
- * debian/patches/any/unsubmitted-tst-array-as-needed.diff: Fix tst-array2
- and tst-array5 to build with --no-as-needed to prevent test regression.
+ * debian/patches/any/cvs-tst-array-as-needed.diff: Fix tst-array2 and
+ tst-array5 to build with --no-as-needed to prevent test regressions.
[ Matthias Klose ]
* debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
Copied:
glibc-package/branches/eglibc-2.17/debian/patches/any/cvs-tst-array-as-needed.diff
(from rev 5444,
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-tst-array-as-needed.diff)
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/any/cvs-tst-array-as-needed.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.17/debian/patches/any/cvs-tst-array-as-needed.diff
2013-01-23 06:16:40 UTC (rev 5448)
@@ -0,0 +1,23 @@
+commit 5655a0b58e1ba27b05c94c684c74b7078cb814d5
+Author: Adam Conrad <[email protected]>
+Date: Tue Jan 22 23:05:33 2013 -0700
+
+ Build elf/tst-array2 and elf/tst-array5 with --no-as-needed
+
+ * elf/Makefile (LDFLAGS-tst-array2): Add $(no-as-needed).
+ (LDFLAGS-tst-array5): Likewise.
+
+diff --git a/elf/Makefile b/elf/Makefile
+index 84f8397..6d4b365 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -849,6 +849,9 @@ LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack
+ LDFLAGS-tst-execstack-prog = -Wl,-z,execstack
+ endif
+
++LDFLAGS-tst-array2 = $(no-as-needed)
++LDFLAGS-tst-array5 = $(no-as-needed)
++
+ $(objpfx)tst-array1.out: tst-array1.exp $(objpfx)tst-array1
+ $(built-program-cmd) > $@
+ cmp $@ tst-array1.exp > /dev/null
Deleted:
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-tst-array-as-needed.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-tst-array-as-needed.diff
2013-01-23 05:52:38 UTC (rev 5447)
+++
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-tst-array-as-needed.diff
2013-01-23 06:16:40 UTC (rev 5448)
@@ -1,14 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 84f8397..6d4b365 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -849,6 +849,9 @@ LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack
- LDFLAGS-tst-execstack-prog = -Wl,-z,execstack
- endif
-
-+LDFLAGS-tst-array2 = $(no-as-needed)
-+LDFLAGS-tst-array5 = $(no-as-needed)
-+
- $(objpfx)tst-array1.out: tst-array1.exp $(objpfx)tst-array1
- $(built-program-cmd) > $@
- cmp $@ tst-array1.exp > /dev/null
Modified: glibc-package/branches/eglibc-2.17/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-23
05:52:38 UTC (rev 5447)
+++ glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-23
06:16:40 UTC (rev 5448)
@@ -220,4 +220,4 @@
any/local-disable-libnss-db.diff
any/local-revert-bz13979.diff
any/local-tst-eintr1-eagain.diff
-any/unsubmitted-tst-array-as-needed.diff
+any/cvs-tst-array-as-needed.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
