[Glibc-bsd-commits] r3633 - trunk/kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2011-07-27 15:11:01 +0000 (Wed, 27 Jul 2011)
New Revision: 3633

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/rules
Log:
Make regex kludge even more strict.  This should finally fix FTBFS on any-i386.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-26 16:43:22 UTC (rev 3632)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-27 15:11:01 UTC (rev 3633)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0~svn224413-2) UNRELEASED; urgency=low
+
+  * Make regex kludge even more strict.  This should finally fix FTBFS
+    on any-i386.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 27 Jul 2011 17:10:44 +0200
+
 kfreebsd-9 (9.0~svn224413-1) experimental; urgency=low
 
   * 003_glibc_dev_aicasm.diff: Add fix for FTBFS on hurd-i386.

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-07-26 16:43:22 UTC (rev 3632)
+++ trunk/kfreebsd-9/debian/rules	2011-07-27 15:11:01 UTC (rev 3633)
@@ -87,13 +87,13 @@
 	set -e ; find src/sys -type f | (while read i ; do \
 		sed -i $$i \
 		-e 's/defined\s*(\s*__FreeBSD__\s*)/1/g' \
-		-e 's/#\s*ifdef\s*__FreeBSD__\s*/#if 1/g' \
-		-e 's/#\s*ifndef\s*__FreeBSD__\s*/#if 0/g' \
+		-e 's/#\s*ifdef\s*__FreeBSD__\s*$/#if 1/g' \
+		-e 's/#\s*ifndef\s*__FreeBSD__\s*$/#if 0/g' \
 		-e 's/__FreeBSD__/$(major)/g' \
 		\
 		-e 's/defined\s*(\s*\(__linux__\|linux\)\s*)/0/g' \
-		-e 's/#\s*ifdef\s*\(__linux__\|linux\)\s*/#if 0/g' \
-		-e 's/#\s*ifndef\s*\(__linux__\|linux\)\s*/#if 1/g' \
+		-e 's/#\s*ifdef\s*\(__linux__\|linux\)\s*$/#if 0/g' \
+		-e 's/#\s*ifndef\s*\(__linux__\|linux\)\s*$/#if 1/g' \
 	; done)
 
 	install debian/gen-ld-u-options src/usr.sbin/config