diff options
| author | riastradh <riastradh> | 2013-05-09 23:37:25 +0000 |
|---|---|---|
| committer | riastradh <riastradh> | 2013-05-09 23:37:25 +0000 |
| commit | cec703cf29d80e63a369189af54c1ccdc7995248 (patch) | |
| tree | eef7f13a77e111e43481a085f3d5cf0aabb03aa6 /mk/bsd.pkg.use.mk | |
| parent | b4ea6815358e106ab97e451afb9445aefa5c0f6b (diff) | |
| download | pkgsrc-cec703cf29d80e63a369189af54c1ccdc7995248.tar.gz | |
Split BUILD_DEPENDS into TOOL_DEPENDS and BUILD_DEPENDS in mk/.
Build depends are target packages that are needed at build-time for,
e.g., static libraries to link against, header files to include, &c.
Tool depends are native packages that are needed at build-time for,
e.g., compilers/linkers/&c. to run.
ok agc
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 1d6da873b75..8b3cf9fe36f 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.52 2013/05/09 13:53:48 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.53 2013/05/09 23:37:25 riastradh Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -91,6 +91,10 @@ BUILD_DEFS+= KERBEROS # Makefiles to invoke the proper libtool. # .if !empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77) +. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) # XXX +PKG_FAIL_REASON+= "Cross-compiling Fortran with libtool NYI." +. endif + PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool-fortran PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool-fortran @@ -98,8 +102,13 @@ PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool-fortran BUILD_DEPENDS+= libtool-fortran>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-fortran . endif .else +. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +PKG_LIBTOOL?= ${CROSSBASE}/bin/libtool +PKG_SHLIBTOOL?= ${CROSSBASE}/bin/shlibtool +. else PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool +. endif .endif _LIBTOOL?= ${PKG_LIBTOOL} _SHLIBTOOL?= ${PKG_SHLIBTOOL} @@ -107,7 +116,11 @@ LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) LIBTOOL_REQD?= 2.2.6bnb3 -BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +TOOL_DEPENDS+= cross-libtool-base-${MACHINE_ARCH}>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../cross/libtool-base +.else +TOOL_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base +.endif CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif |