diff options
| author | maya <maya@pkgsrc.org> | 2017-07-08 21:03:16 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-07-08 21:03:16 +0000 |
| commit | cec300ab278dc5719f812afe4a8b105321d39d41 (patch) | |
| tree | bb8b824368001c09eaea95f5304e4781caa9c138 /lang/gcc6 | |
| parent | 0493bb3e83425257a53e828582144cadf2aa4276 (diff) | |
| download | pkgsrc-cec300ab278dc5719f812afe4a8b105321d39d41.tar.gz | |
gcc6: on netbsd only, bump libstdc++ major to 7 to match base version.
this stops packages using gcc6 as a compiler from linking to two libstdc++s
at once.
Diffstat (limited to 'lang/gcc6')
| -rw-r--r-- | lang/gcc6/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile index bdaecf91cb5..e8cd697f400 100644 --- a/lang/gcc6/Makefile +++ b/lang/gcc6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/07/07 14:52:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2017/07/08 21:03:16 maya Exp $ GCC_PKGNAME= gcc6 .include "version.mk" @@ -8,6 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc6-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/} EXTRACT_SUFX= .tar.xz @@ -85,6 +86,12 @@ CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} .if !empty(MACHINE_PLATFORM:MNetBSD-*-*) # on NetBSD, use the native SSP code in libc CONFIGURE_ARGS+= --disable-libssp +# Match base libstdc++ major +SUBST_CLASSES+= libstdc +SUBST_STAGE.libstdc= pre-configure +SUBST_FILES.libstdc= libstdc++-v3/configure +SUBST_MESSAGE.libstdc= Bumping libstdc++ major to 7 +SUBST_SED.libstdc= -e 's,libtool_VERSION=6:,libtool_VERSION=7:,g' .else CONFIGURE_ARGS+= --enable-libssp .endif |