diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-04-04 11:12:50 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-04-04 11:12:50 +0000 |
| commit | 68a00c4b32989c4080f155945142b8ca91b1adde (patch) | |
| tree | b15c92aaa591577ed01e0aa2a5d1c89c6d75d3c7 /lang/gcc48-libs | |
| parent | 43422c8c9068fa8ae23ae8010d80c338ce7cb370 (diff) | |
| download | pkgsrc-68a00c4b32989c4080f155945142b8ca91b1adde.tar.gz | |
Explicitly depend upon gcc48 rather than relying on general GCC_DIST_VERSION,
which is currently set to gcc47.
Should fix pbulk resolution failures.
Diffstat (limited to 'lang/gcc48-libs')
| -rw-r--r-- | lang/gcc48-libs/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index 1a6164526fd..9f95063b0de 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2013/04/01 21:06:18 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2013/04/04 11:12:50 jperkin Exp $ GCC_PKGNAME= gcc48 .include "../../lang/${GCC_PKGNAME}/version.mk" -DISTNAME= gcc-${GCC_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-libs-${GCC_DIST_VERSION} +DISTNAME= gcc-${GCC48_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc48 package so that with the dependence pattern ## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48. @@ -22,12 +22,12 @@ USE_TOOLS+= pax NO_BUILD= yes -## Depend on exactly ${GCC_DIST_VERSION}. -BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48 +## Depend on exactly ${GCC48_DIST_VERSION}. +BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48 .include "../../mk/bsd.prefs.mk" -FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC_DIST_VERSION}* +FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}* .include "../../mk/find-prefix.mk" GCC_SUBPREFIX= ${GCC_PKGNAME} @@ -50,7 +50,7 @@ GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ ${ECHO} '@pkgdir ${GCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: - ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC_DIST_VERSION}*' | \ + ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \ ${SED} -n -e's,^${GCC_PREFIX}/,,' -e'/libexec\//d' \ -e'/libgij/d;/libgcj/d;/libjvm/d' \ -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES} |