diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-02 21:06:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-02 21:06:51 +0000 |
| commit | d51560f78af4ade335de4cd377f82344f96f0a96 (patch) | |
| tree | 3977ec484801b819a37468eaca0b1436d9ea1370 /mk | |
| parent | 1442a19b0f648d77a98f7c5f84222cf3698d7d40 (diff) | |
| download | pkgsrc-d51560f78af4ade335de4cd377f82344f96f0a96.tar.gz | |
Bump build-dependency on xpkgwedge to >=1.5, and add a build-dependency
on buildlink-x11 if USE_BUILDLINK_ONLY is defined. Pass all of
CPPFLAGS/CFLAGS/CXXFLAGS/LDFLAGS to buildlink-x11 through PKGSRC_* versions
of those values. Also add preliminary support for USE_BUILDLINK_X11 for
buildlinking X11R6 instead of USE_X11 (hi zuntum!).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 426281f665f..6021db93c7a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.775 2001/07/02 08:02:33 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.776 2001/07/02 21:06:51 jlam Exp $ # # This file is in the public domain. # @@ -99,14 +99,17 @@ SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} X11PREFIX= ${LOCALBASE} XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf XMKMF_FLAGS?= -a -.if defined(USE_BUILDLINK_ONLY) -XMKMF_FLAGS+= -DBuildLink -.endif .else X11PREFIX= ${X11BASE} XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf XMKMF_FLAGS?= -a .endif +.if defined(USE_BUILDLINK_ONLY) +XMKMF_FLAGS+= -DBuildLink +.if defined(USE_BUILDLINK_X11) +XMKMF_FLAGS+= -DBuildLinkX11 +.endif +.endif XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} .if defined(USE_MOTIF12) @@ -132,10 +135,14 @@ MOTIFBASE?= ${X11PREFIX} .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) -BUILD_DEPENDS+= xpkgwedge>=1.4:../../pkgtools/xpkgwedge +BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge +.endif +.if defined(USE_BUILDLINK_ONLY) +BUILD_DEPENDS+= buildlink-x11>=0.4:../../pkgtools/buildlink-x11 MAKE_ENV+= PKGSRC_CPPFLAGS="${CPPFLAGS}" MAKE_ENV+= PKGSRC_CFLAGS="${CFLAGS}" MAKE_ENV+= PKGSRC_CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= PKGSRC_LDFLAGS="${LDFLAGS}" .endif PREFIX= ${X11PREFIX} .elif defined(USE_CROSSBASE) @@ -323,7 +330,10 @@ LDFLAGS+= -Wl,-R${MOTIFBASE}/lib LDFLAGS+= -L${MOTIFBASE}/lib .endif .endif -LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib +LDFLAGS+= -Wl,-R${X11BASE}/lib +.if !defined(USE_BUILDLINK_X11) +LDFLAGS+= -L${X11BASE}/lib +.endif .endif LDFLAGS+= -Wl,-R${LOCALBASE}/lib .if !defined(USE_BUILDLINK_ONLY) @@ -668,12 +678,8 @@ PKG_DBDIR?= ${DESTDIR}/var/db/pkg # shared/dynamic motif libs .if defined(USE_MOTIF) -.if defined(USE_BUILDLINK_ONLY) && (${MOTIFBASE} == ${LOCALBASE}) -MOTIFLIB?= -L${X11BASE}/lib -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -lXm -lXp -.else MOTIFLIB?= -L${MOTIFBASE}/lib -L${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -lXm -lXp .endif -.endif # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree # of dependencies for building, and the current target. |