diff options
| author | tv <tv> | 2004-11-11 22:32:45 +0000 |
|---|---|---|
| committer | tv <tv> | 2004-11-11 22:32:45 +0000 |
| commit | 24c4fee83eaf194738219a449773fcffe6efa5f8 (patch) | |
| tree | ac6f5e97a90b040ed197fac6ecf63c41e7a4001c /mk | |
| parent | 907d852b32e6fba11a1f822f49920b912a6f6c69 (diff) | |
| download | pkgsrc-24c4fee83eaf194738219a449773fcffe6efa5f8.tar.gz | |
Change the way _OPSYS_LIBTOOL_REQD works slightly.
Rather than replacing the LIBTOOL_REQD value, add two BUILD_DEPENDS lines.
That way, the higher numbered BUILD_DEPENDS wins -- allowing the version
in bsd.pkg.mk to be bumped beyond the value in the platform .mk and still
be enforced properly.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b79379b56d6..b0feb2f3b5a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1531 2004/11/02 08:31:45 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1532 2004/11/11 22:32:45 tv Exp $ # # This file is in the public domain. # @@ -387,11 +387,6 @@ CONFIGURE_ENV+= LIBS=${LIBS:Q} CONFIGURE_ENV+= install_sh=${INSTALL:Q} .endif -.if defined(_OPSYS_LIBTOOL_REQD) -LIBTOOL_REQD= ${_OPSYS_LIBTOOL_REQD} -.else -LIBTOOL_REQD?= 1.5.10nb1 -.endif # # PKG_LIBTOOL is the path to the libtool script installed by libtool-base. # _LIBTOOL is the path the libtool used by the build, which could be the @@ -406,7 +401,10 @@ _SHLIBTOOL?= ${PKG_SHLIBTOOL} LIBTOOL?= ${PKG_LIBTOOL} SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) -BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base +.if defined(_OPSYS_LIBTOOL_REQD) +BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base +.endif +BUILD_DEPENDS+= libtool-base>=1.5.10nb6:../../devel/libtool-base CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool |