diff options
| author | adam <adam> | 2013-04-19 16:34:46 +0000 |
|---|---|---|
| committer | adam <adam> | 2013-04-19 16:34:46 +0000 |
| commit | 9fd64e9db3e857641a7b9d89b8713522b9e5f0fe (patch) | |
| tree | 6a361e1c6ff67d9c59921a0fff920560885a37a1 | |
| parent | cc2906d1eb7416eea850347af63416b0cd47617d (diff) | |
| download | pkgsrc-9fd64e9db3e857641a7b9d89b8713522b9e5f0fe.tar.gz | |
Renaming GCC_DIST_VERSION to GCC48_DIST_VERSION
| -rw-r--r-- | lang/gcc48-libs/Makefile | 14 | ||||
| -rw-r--r-- | lang/gcc48/Makefile | 8 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index b32b05feac8..37d776c73c9 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2013/04/17 17:40:33 adam Exp $ +# $NetBSD: Makefile,v 1.4 2013/04/19 16:34:47 adam 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} diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index d4ec5ff2567..129b4e91d26 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.4 2013/04/18 07:47:33 sbd Exp $ +# $NetBSD: Makefile,v 1.5 2013/04/19 16:34:47 adam Exp $ GCC_PKGNAME= gcc48 .include "version.mk" -DISTNAME= gcc-${GCC_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION} +DISTNAME= gcc-${GCC48_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc48-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! PKGREVISION= 0 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/} +MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= sbd@NetBSD.org diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index a81a76342dc..8a3fc079914 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.134 2013/04/17 09:48:30 adam Exp $ +# $NetBSD: gcc.mk,v 1.135 2013/04/19 16:34:46 adam Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -109,7 +109,7 @@ GCC_REQD+= 20120614 # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc # without the PKGREVISIONs. .include "../../lang/gcc48/version.mk" -_GCC_DIST_VERSION:= ${GCC_DIST_VERSION} +_GCC_DIST_VERSION:= ${GCC48_DIST_VERSION} # _GCC2_PATTERNS matches N s.t. N <= 2.95.3. _GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \ |