[Glibc-bsd-commits] r1599 - in trunk/posixtestsuite/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2006-06-14 06:10:48 +0000 (Wed, 14 Jun 2006)
New Revision: 1599

Added:
   trunk/posixtestsuite/debian/patches/01_gnu.patch
Removed:
   trunk/posixtestsuite/debian/patches/01_linux-gnu.diff
Modified:
   trunk/posixtestsuite/debian/changelog
Log:
debian/patches/01_linux-gnu.diff: Renamed to ...
debian/patches/01_gnu.patch: ... this. Rediff.


Modified: trunk/posixtestsuite/debian/changelog
===================================================================
--- trunk/posixtestsuite/debian/changelog	2006-06-14 06:07:34 UTC (rev 1598)
+++ trunk/posixtestsuite/debian/changelog	2006-06-14 06:10:48 UTC (rev 1599)
@@ -1,6 +1,8 @@
 posixtestsuite (1.5.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - debian/patches/01_linux-gnu.diff: Renamed to ...
+    - debian/patches/01_gnu.patch: ... this. Rediff.
     - debian/patches/00_find_warnings.patch: Make find POSIX compliant.
     - Do not leave "sigpause/4.1.test" process running after finishing.
       (Closes: #303365)

Copied: trunk/posixtestsuite/debian/patches/01_gnu.patch (from rev 1594, trunk/posixtestsuite/debian/patches/01_linux-gnu.diff)
===================================================================
--- trunk/posixtestsuite/debian/patches/01_linux-gnu.diff	2006-06-13 17:28:17 UTC (rev 1594)
+++ trunk/posixtestsuite/debian/patches/01_gnu.patch	2006-06-14 06:10:48 UTC (rev 1599)
@@ -0,0 +1,19 @@
+diff -Naur -x .svn -x CVS posixtestsuite.orig/LDFLAGS posixtestsuite/LDFLAGS
+--- posixtestsuite.orig/LDFLAGS	2005-06-03 04:32:42.000000000 +0300
++++ posixtestsuite/LDFLAGS	2005-11-29 03:43:56.000000000 +0200
+@@ -4,9 +4,6 @@
+ #Place the -l, -L, or -D piece before the item to link.
+ #Lines beginning with # are comments.
+ #
+-#For example,
+-#-lpthread -D_GNU_SOURCE
+-#
+ #Recommended flags:
+ #-D_XOPEN_SOURCE=600 -lpthread -lrt -lm
+ #
+@@ -14,3 +11,5 @@
+ # allow for the NPTL-specific compilation (used in some test cases)
+ # Note: this sometimes require the package nptl-devel.*.rpm to be installed.
+ #-I /usr/include/nptl -L /usr/lib/nptl -D_XOPEN_SOURCE=600 -lpthread -lrt -lm
++
++-D_GNU_SOURCE -lpthread -lrt

Deleted: trunk/posixtestsuite/debian/patches/01_linux-gnu.diff
===================================================================
--- trunk/posixtestsuite/debian/patches/01_linux-gnu.diff	2006-06-14 06:07:34 UTC (rev 1598)
+++ trunk/posixtestsuite/debian/patches/01_linux-gnu.diff	2006-06-14 06:10:48 UTC (rev 1599)
@@ -1,12 +0,0 @@
-diff -ur posixtestsuite-1.4.3.old/LDFLAGS posixtestsuite-1.4.3/LDFLAGS
---- posixtestsuite-1.4.3.old/LDFLAGS	2004-07-06 00:17:13.000000000 +0200
-+++ posixtestsuite-1.4.3/LDFLAGS	2004-09-01 14:33:58.000000000 +0200
-@@ -3,6 +3,5 @@
- #
- #Place the -l, -L, or -D piece before the item to link.
- #Lines beginning with # are comments.
--#
--#For example,
--#-lpthread -D_GNU_SOURCE
-+
-+-lpthread -D_GNU_SOURCE -lrt