Anything changed on rawhide builders recently? Can't build ladvd

[David Howells]

David Howells <dhowells at redhat.com> wrote:

> A better way to do this might be to make the header installation discard the
> "_UAPI" prefix that got added.

As the attached patch.

David
---
commit 75a88e14a97d239a47cbd0fc55fc23416007d733
Author: David Howells <dhowells at redhat.com>
Date:   Wed Nov 7 17:14:14 2012 +0000

    UAPI: Strip the _UAPI prefix from header guards during header installation
    
    Strip the _UAPI prefix from header guards during header installation so that
    any userspace dependencies aren't affected.  glibc, for example, checks for
    linux/types.h, linux/kernel.h, linux/compiler.h and linux/list.h - though the
    last two aren't actually exported.
    
    Signed-off-by: David Howells <dhowells at redhat.com>

diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 239d22d..6c353ae 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -42,6 +42,9 @@ foreach my $filename (@files) {
 		$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 /* !;
 		printf {$out} "%s", $line;
 	}
 	close $out;