diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-06-21 09:40:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-06-21 09:40:47 +0000 |
| commit | fc16850f7bcb20a2382bf04f0b81446127d0ff3b (patch) | |
| tree | d166a9ceb952744952b88c32db1ca3bf2cd07934 /lang/gcc48-libs/Makefile | |
| parent | 05333dffcb0b85808bc3d4ecb7a9fde0d0d42815 (diff) | |
| download | pkgsrc-fc16850f7bcb20a2382bf04f0b81446127d0ff3b.tar.gz | |
Revert part of previous, GCC_TARGET_MACHINE must be used so that, when set by
the user, the runtime directory is in sync between the main gcc package and
the gcc-libs package.
Bump PKGREVISIONs.
Diffstat (limited to 'lang/gcc48-libs/Makefile')
| -rw-r--r-- | lang/gcc48-libs/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index 926621fd211..37d8db5d718 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/06/14 09:01:41 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2013/06/21 09:40:47 jperkin Exp $ GCC_PKGNAME= gcc48 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -8,7 +8,7 @@ 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. -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= # empty DISTFILES= # empty @@ -32,8 +32,8 @@ FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}* LIBGCC_SUBPREFIX= ${GCC_PKGNAME} LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX} -LIBGCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} -BUILD_DEFS+= LIBGCC_TARGET_MACHINE +GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} +BUILD_DEFS+= GCC_TARGET_MACHINE .include "../../mk/bsd.prefs.mk" .if ${_OPSYS_SHLIB_TYPE} == "dylib" @@ -44,10 +44,10 @@ SHLIB_EXT= so LIBRARY_FILES= ${WRKDIR}/lib_files -GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${LIBGCC_TARGET_MACHINE}/,' \ +GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \ ${LIBRARY_FILES}; GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ - ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${LIBGCC_TARGET_MACHINE}/lib' ; + ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \ @@ -56,10 +56,10 @@ ${LIBRARY_FILES}: -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES} do-install: ${LIBRARY_FILES} - ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib || \ - ${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE}/lib + ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \ + ${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib cd ${LIBGCC_PREFIX} && \ - ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${LIBGCC_TARGET_MACHINE} <${LIBRARY_FILES} + ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE} <${LIBRARY_FILES} .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" |