kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix and tweak libX11 cross-build.

Browse source 
- 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.
This commit is contained in:
riastradh 2013-05-10 22:38:31 +00:00
parent 491000eca0
commit 5d13c04fcb
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
x11/libX11/Makefile
View file

@ -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"