diff options
| author | riastradh <riastradh@pkgsrc.org> | 2013-05-10 22:38:31 +0000 |
|---|---|---|
| committer | riastradh <riastradh@pkgsrc.org> | 2013-05-10 22:38:31 +0000 |
| commit | 1838109c4b0b7e14a2d44c1efa109d47fe8fbfd9 (patch) | |
| tree | 40b7f36b07103d999b29d80bf9ea9ae9e5f6312d /x11/libX11 | |
| parent | 2cc1898f0fcb11f92c09c3ade17198d65b0433f0 (diff) | |
| download | pkgsrc-1838109c4b0b7e14a2d44c1efa109d47fe8fbfd9.tar.gz | |
Fix and tweak libX11 cross-build.
- Tool-depend on xproto for data for a tool that libX11 builds and
runs.
- No need to pass CPPFLAGS_FOR_BUILD=-I${PREFIX}/include.
- Pass CC_FOR_BUILD=${NATIVE_CC:Q} in CONFIGURE_ENV, not MAKE_ENV.
Diffstat (limited to 'x11/libX11')
| -rw-r--r-- | x11/libX11/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 4f86b188e34..b8d17f1dfff 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/29 05:06:33 asau Exp $ +# $NetBSD: Makefile,v 1.30 2013/05/10 22:38:31 riastradh Exp $ # DISTNAME= libX11-1.5.0 @@ -31,10 +31,6 @@ CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 CONFIGURE_ARGS+= --disable-malloc0returnsnull .endif -.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) -MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include -.endif - CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h CPPFLAGS.MirBSD+= -pthread LDFLAGS.MirBSD+= -pthread @@ -50,6 +46,14 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix" 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} + +# XXX This needs to match the version of xcb-proto we get for the +# target by buildlink3. +TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto +.endif + .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/kbproto/buildlink3.mk" |