[pkgsrc/trunk]: pkgsrc/lang gcc{48, 49, 5, 7}: on netbsd only, bump libstdc++ ma...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang gcc{48, 49, 5, 7}: on netbsd only, bump libstdc++ ma...
From: maya <maya%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:28:22 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f41991aa566
branches:  trunk
changeset: 364990:4f41991aa566
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Jul 09 05:30:41 2017 +0000

description:
gcc{48,49,5,7}: on netbsd only, bump libstdc++ major to 7.
bump pkgrevision.

while here, synchronize libssp comment to a clearer one.

bump gcc*-lib revision to be one higher.

diffstat:

 lang/gcc48-libs/Makefile |   4 ++--
 lang/gcc48/Makefile      |  12 +++++++++---
 lang/gcc49-libs/Makefile |   4 ++--
 lang/gcc49/Makefile      |  17 ++++++++++++-----
 lang/gcc5-libs/Makefile  |   4 ++--
 lang/gcc5/Makefile       |  12 +++++++++---
 lang/gcc6/Makefile       |   4 ++--
 lang/gcc7/Makefile       |  12 +++++++++---
 8 files changed, 47 insertions(+), 22 deletions(-)

diffs (208 lines):

diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc48-libs/Makefile
--- a/lang/gcc48-libs/Makefile  Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc48-libs/Makefile  Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/06/01 13:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@
 ## 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
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc48/Makefile
--- a/lang/gcc48/Makefile       Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc48/Makefile       Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/06/22 21:44:49 maya Exp $
+# $NetBSD: Makefile,v 1.35 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "version.mk"
@@ -8,7 +8,7 @@
 ## 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=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -79,8 +79,14 @@
 
 MAKE_ENV.NetBSD+=      ac_cv_func_gethostbyname_r=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-# use the native SSP code in netbsd libc
+# native SSP conflicts with gcc's libssp
 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
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc49-libs/Makefile
--- a/lang/gcc49-libs/Makefile  Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc49-libs/Makefile  Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/01 13:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc49 package so that with the dependence pattern
 ## '{gcc49,gcc49-libs}>=4.9.*' pkg_add will choose gcc49-libs over gcc49.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc49/Makefile
--- a/lang/gcc49/Makefile       Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc49/Makefile       Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/06/22 21:44:49 maya Exp $
+# $NetBSD: Makefile,v 1.19 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "version.mk"
@@ -9,7 +9,7 @@
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc49-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -72,10 +72,17 @@
 ## For target librarys and libjava programs.
 CONFIGURE_ENV+=                LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)                                                                                                                                                               
      # use the native SSP code in netbsd libc, gcc libssp conflicts with it.
-CONFIGURE_ARGS+=        --disable-libssp
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+# native SSP conflicts with gcc's libssp
+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
+CONFIGURE_ARGS+=       --enable-libssp
 .endif
 
 CONFIGURE_ARGS+=       --enable-languages=${LANGS:Q}
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc5-libs/Makefile
--- a/lang/gcc5-libs/Makefile   Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc5-libs/Makefile   Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/06/01 13:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=   gcc5
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc5 package so that with the dependence pattern
 ## '{gcc5,gcc5-libs}>=5.1.*' pkg_add will choose gcc5-libs over gcc5.
-PKGREVISION=   4
+PKGREVISION=   5
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc5/Makefile
--- a/lang/gcc5/Makefile        Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc5/Makefile        Sun Jul 09 05:30:41 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/07/07 14:52:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=           gcc5
-PKGREVISION=           3
+PKGREVISION=           4
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC5_DIST_VERSION}
@@ -84,8 +84,14 @@
 CONFIGURE_ARGS+=       --enable-long-long
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-# on NetBSD, use the native SSP code in libc
+# native SSP conflicts with gcc's libssp
 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
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc6/Makefile        Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/07/08 21:03:16 maya Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -84,7 +84,7 @@
 CONFIGURE_ARGS+=       --enable-long-long
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-# on NetBSD, use the native SSP code in libc
+# native SSP conflicts with gcc's libssp
 CONFIGURE_ARGS+=       --disable-libssp
 # Match base libstdc++ major
 SUBST_CLASSES+=                libstdc
diff -r 6b721469cc53 -r 4f41991aa566 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Sun Jul 09 00:43:08 2017 +0000
+++ b/lang/gcc7/Makefile        Sun Jul 09 05:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/07/07 14:52:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/09 05:30:41 maya Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -8,7 +8,7 @@
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc7-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -77,8 +77,14 @@
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-# on NetBSD, use the native SSP code in libc
+# native SSP conflicts with gcc's libssp
 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
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated textproc/p5-PDF-API2 to 2.033
Next by Date: [pkgsrc/trunk]: pkgsrc/doc gcc
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated textproc/p5-PDF-API2 to 2.033
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc gcc
Indexes:
Home | Main Index | Thread Index | Old Index