Mega-kludgerific botch to fix x11/libX11 cross-build. XXX WRONG! Index: x11/libX11/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/libX11/Makefile,v retrieving revision 1.29 diff -p -u -r1.29 Makefile --- x11/libX11/Makefile 29 Oct 2012 05:06:33 -0000 1.29 +++ x11/libX11/Makefile 23 Apr 2013 13:29:24 -0000 @@ -50,6 +50,21 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" .endif +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} + +SUBST_CLASSES+= keysymdef +SUBST_FILES.keysymdef+= configure +SUBST_FILES.keysymdef+= src/Makefile.in +SUBST_MESSAGE.keysymdef+= Use keysymdef.h in the cross destdir. +SUBST_STAGE.keysymdef+= pre-configure +SUBST_SED.keysymdef+= -e s,'$$KEYSYMDEFDIR',${CROSS_DESTDIR:Q}'&',g + +# [TRC 20130328: Mega-kludgerific! We need a better way to do this! +# Also, does this obviate the need for the above substitution?] +TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto +.endif + .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/kbproto/buildlink3.mk"