diff --git a/xorg/libxcb/sysroot.patch.cross b/xorg/libxcb/sysroot.patch.cross index 3f845abeb..0af4d160a 100644 --- a/xorg/libxcb/sysroot.patch.cross +++ b/xorg/libxcb/sysroot.patch.cross @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../libxcb/sysroot.patch.cross -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -16,14 +16,23 @@ pkg-config doesn't prepend the SYSROOT when asking for an explicit variable ---- ./configure.orig 2008-02-22 02:31:42.000000000 +0000 -+++ ./configure 2008-02-22 02:32:41.000000000 +0000 -@@ -20712,7 +20712,7 @@ +--- ./configure.orig 2010-05-03 10:12:37.000000000 -0400 ++++ ./configure 2010-05-03 10:13:33.000000000 -0400 +@@ -12791,7 +12791,7 @@ # Find the xcb-proto protocol descriptions - { echo "$as_me:$LINENO: checking XCBPROTO_XCBINCLUDEDIR" >&5 - echo $ECHO_N "checking XCBPROTO_XCBINCLUDEDIR... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking XCBPROTO_XCBINCLUDEDIR" >&5 + $as_echo_n "checking XCBPROTO_XCBINCLUDEDIR... " >&6; } -XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` -+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=xcbincludedir xcb-proto` - { echo "$as_me:$LINENO: result: $XCBPROTO_XCBINCLUDEDIR" >&5 - echo "${ECHO_T}$XCBPROTO_XCBINCLUDEDIR" >&6; } ++XCBPROTO_XCBINCLUDEDIR="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=xcbincludedir xcb-proto)" + { $as_echo "$as_me:$LINENO: result: $XCBPROTO_XCBINCLUDEDIR" >&5 + $as_echo "$XCBPROTO_XCBINCLUDEDIR" >&6; } + +@@ -12803,7 +12803,7 @@ + # Find the xcbgen Python package + { $as_echo "$as_me:$LINENO: checking XCBPROTO_XCBPYTHONDIR" >&5 + $as_echo_n "checking XCBPROTO_XCBPYTHONDIR... " >&6; } +-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` ++XCBPROTO_XCBPYTHONDIR="$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=pythondir xcb-proto)" + { $as_echo "$as_me:$LINENO: result: $XCBPROTO_XCBPYTHONDIR" >&5 + $as_echo "$XCBPROTO_XCBPYTHONDIR" >&6; }