[Lunar-commits] <moonbase> perl-tk: Adjusting the BUILD to fix a failure on Xlib.h conflicts. Used the fix

[Dennis `stumbles` Veatch]

commit 1f25d557632591ba0dc3fad45abfc3a4fdc38d11
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Nov 29 18:23:09 2010 -0500

    perl-tk: Adjusting the BUILD to fix a failure on Xlib.h conflicts. Used the fix
    
    from http://lists.suse.com/archive/opensuse-commit/2010-11/msg00719.html
    
    The specific failure:
    In file included from Xlib_f.c:8:0:
    Xlib.h:22:15: error: conflicting types for 'XKeycodeToKeysym'
    /usr/include/X11/Xlib.h:1694:15: note: previous declaration of 'XKeycodeToKeysym' was here
    make[1]: *** [Xlib_f.o] Error 1
    make[1]: Leaving directory `/usr/src/Tk-804.029/pTk'
    make: *** [pTk/libpTk.a] Error 2
---
 perl/perl-tk/BUILD |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/perl/perl-tk/BUILD b/perl/perl-tk/BUILD
index d098b20..e1d8f73 100644
--- a/perl/perl-tk/BUILD
+++ b/perl/perl-tk/BUILD
@@ -1,6 +1,9 @@
 (
 
+# This fixes a Xlib.h conflicts causing the build to fail. Revisit on next bump.
+  sed -i "3i #ifdef _X11_XLIB_H_ \n #define _XLIB_H_ \n #endif" pTk/Xlib.h &&
+
   perl Makefile.PL  &&
   default_make
 
-) > $C_FIFO 2>&1
\ No newline at end of file
+) > $C_FIFO 2>&1