diff sources/patches/linux-noperl-headers.patch @ 1584:75e291fafacc

linux 3.8.
author Rob Landley <rob@landley.net>
date Mon, 25 Feb 2013 11:45:44 -0600
parents bee6b26a006d
children 3cbf1abde44a
line wrap: on
line diff
--- a/sources/patches/linux-noperl-headers.patch	Sun Feb 17 22:26:10 2013 -0600
+++ b/sources/patches/linux-noperl-headers.patch	Mon Feb 25 11:45:44 2013 -0600
@@ -58,7 +58,7 @@
 +		-e 's@^#include <linux/compiler.h>@@' \
 +		-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
 +		-e 's/(^|[ \t])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
-+		-e 's@#(ifndef|define|endif /[*]) _UAPI@#\1 @' \
++		-e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
 +		"$i" > "$OUTDIR/$FILE.sed" || exit 1
 +	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
 +		> "$OUTDIR/$FILE"
@@ -134,9 +134,9 @@
 -		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
 -		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
 -		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
--		$line =~ s/#ifndef _UAPI/#ifndef /;
--		$line =~ s/#define _UAPI/#define /;
--		$line =~ s!#endif /[*] _UAPI!#endif /* !;
+-		$line =~ s/#ifndef\s+_UAPI/#ifndef /;
+-		$line =~ s/#define\s+_UAPI/#define /;
+-		$line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
 -		printf {$out} "%s", $line;
 -	}
 -	close $out;