pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gcc6 gcc6: on netbsd only, bump libstdc++ major t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c569149200d
branches:  trunk
changeset: 364981:6c569149200d
user:      maya <maya%pkgsrc.org@localhost>
date:      Sat Jul 08 21:03:16 2017 +0000

description:
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:

 lang/gcc6/Makefile |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r d528e70d0bb0 -r 6c569149200d lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Sat Jul 08 19:38:18 2017 +0000
+++ b/lang/gcc6/Makefile        Sat Jul 08 21:03:16 2017 +0000
@@ -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 @@
 ## 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 @@
 .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



Home | Main Index | Thread Index | Old Index