Mon Aug 17 18:43:49 2009 UTC ()
Pass down MAKE_ENV when calling make for inplace builds.


(joerg)
diff -r1.8 -r1.9 pkgsrc/pkgtools/libnbcompat/inplace.mk
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/libnbcompat/inplace.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/libnbcompat/inplace.mk 2008/02/22 04:07:55 1.8
+++ pkgsrc/pkgtools/libnbcompat/inplace.mk 2009/08/17 18:43:49 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: inplace.mk,v 1.8 2008/02/22 04:07:55 tnn Exp $ 1# $NetBSD: inplace.mk,v 1.9 2009/08/17 18:43:49 joerg Exp $
2# 2#
3# This file should not be included directly. Use USE_FEATURES instead. 3# This file should not be included directly. Use USE_FEATURES instead.
4# 4#
5# This Makefile fragment builds a working copy of libnbcompat inside 5# This Makefile fragment builds a working copy of libnbcompat inside
6# ${WRKDIR}. 6# ${WRKDIR}.
7# 7#
8 8
9.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
10 10
11LIBNBCOMPAT_USE_PIC?= no 11LIBNBCOMPAT_USE_PIC?= no
12 12
13LIBNBCOMPAT_FILESDIR= ${.CURDIR}/../../pkgtools/libnbcompat/files 13LIBNBCOMPAT_FILESDIR= ${.CURDIR}/../../pkgtools/libnbcompat/files
14LIBNBCOMPAT_SRCDIR= ${WRKDIR}/libnbcompat 14LIBNBCOMPAT_SRCDIR= ${WRKDIR}/libnbcompat
@@ -37,23 +37,23 @@ NBCOMPAT_CONFIGURE_ARGS+= --build=${NATI @@ -37,23 +37,23 @@ NBCOMPAT_CONFIGURE_ARGS+= --build=${NATI
37.endif 37.endif
38NBCOMPAT_CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 38NBCOMPAT_CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
39 39
40pre-configure: libnbcompat-build 40pre-configure: libnbcompat-build
41.PHONY: libnbcompat-build 41.PHONY: libnbcompat-build
42libnbcompat-build: 42libnbcompat-build:
43 @${STEP_MSG} "Configuring and building libnbcompat" 43 @${STEP_MSG} "Configuring and building libnbcompat"
44 ${RUN} ${_ULIMIT_CMD} \ 44 ${RUN} ${_ULIMIT_CMD} \
45 cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV} \ 45 cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV} \
46 AWK=${AWK:Q} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \ 46 AWK=${AWK:Q} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
47 CPPFLAGS=${CPPFLAGS:M*:Q} \ 47 CPPFLAGS=${CPPFLAGS:M*:Q} \
48 ${CONFIGURE_ENV:NLIBS=*} ${CONFIG_SHELL} \ 48 ${CONFIGURE_ENV:NLIBS=*} ${CONFIG_SHELL} \
49 ${CONFIGURE_SCRIPT} ${NBCOMPAT_CONFIGURE_ARGS} && \ 49 ${CONFIGURE_SCRIPT} ${NBCOMPAT_CONFIGURE_ARGS} && \
50 ${MAKE_PROGRAM} 50 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
51.if !empty(LIBNBCOMPAT_USE_PIC:M[Yy][Ee][Ss]) 51.if !empty(LIBNBCOMPAT_USE_PIC:M[Yy][Ee][Ss])
52 @${STEP_MSG} "Configuring and building libnbcompat (PIC version)" 52 @${STEP_MSG} "Configuring and building libnbcompat (PIC version)"
53 ${RUN} ${_ULIMIT_CMD} \ 53 ${RUN} ${_ULIMIT_CMD} \
54 cd ${LIBNBCOMPAT_PICDIR} && ${SETENV} \ 54 cd ${LIBNBCOMPAT_PICDIR} && ${SETENV} \
55 ${CONFIGURE_ENV:NLIBS=*} CFLAGS=${CFLAGS:Q}" -fPIC" \ 55 ${CONFIGURE_ENV:NLIBS=*} CFLAGS=${CFLAGS:Q}" -fPIC" \
56 ${CONFIG_SHELL} \ 56 ${CONFIG_SHELL} \
57 ${CONFIGURE_SCRIPT} ${NBCOMPAT_CONFIGURE_ARGS} && \ 57 ${CONFIGURE_SCRIPT} ${NBCOMPAT_CONFIGURE_ARGS} && \
58 ${MAKE_PROGRAM} 58 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
59.endif 59.endif