[Glibc-bsd-commits] r4021 - trunk/kfreebsd-kernel-headers/debian

[Robert Millan]

Author: rmh
Date: 2012-01-28 20:19:12 +0000 (Sat, 28 Jan 2012)
New Revision: 4021

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Use broader regex to fix all __aligned issues. (Closes: #656562)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-28 19:34:08 UTC (rev 4020)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-28 20:19:12 UTC (rev 4021)
@@ -1,10 +1,13 @@
 kfreebsd-kernel-headers (0.70) UNRELEASED; urgency=low
 
+  [ Steven Chamberlain ]
+  * Use broader regex to fix all __aligned issues. (Closes: #656562)
+
+  [ Robert Millan ]
   * Generate osreldate.h dynamically with up-to-date information.
-  * Add sys/syscall.h.
-  * Add sys/errno.h.
+  * Add sys/syscall.h and sys/errno.h.
 
- -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 20:34:02 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 21:18:25 +0100
 
 kfreebsd-kernel-headers (0.69) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-01-28 19:34:08 UTC (rev 4020)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-01-28 20:19:12 UTC (rev 4021)
@@ -54,7 +54,7 @@
 		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 0/g' \
 		\
 		-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
-		-e 's/__aligned(\([0-9]*\))/ __attribute__((aligned(\1)))/g' \
+		-e 's/__aligned(\([^)]*\?\))/ __attribute__((aligned(\1)))/g' \
 		-e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
 		\
 		-e 's/defined\s*(\s*_SYS_CDEFS_H_\s*)/defined(_SYS_CDEFS_H)/g' \