CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Sun, 9 Jul 2017 05:30:41 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jul  9 05:30:41 UTC 2017

Modified Files:
        pkgsrc/lang/gcc48: Makefile
        pkgsrc/lang/gcc48-libs: Makefile
        pkgsrc/lang/gcc49: Makefile
        pkgsrc/lang/gcc49-libs: Makefile
        pkgsrc/lang/gcc5: Makefile
        pkgsrc/lang/gcc5-libs: Makefile
        pkgsrc/lang/gcc6: Makefile
        pkgsrc/lang/gcc7: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/gcc48/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/gcc48-libs/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/gcc49/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc49-libs/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc5/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc5-libs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc7/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc48/Makefile
diff -u pkgsrc/lang/gcc48/Makefile:1.34 pkgsrc/lang/gcc48/Makefile:1.35
--- pkgsrc/lang/gcc48/Makefile:1.34     Thu Jun 22 21:44:49 2017
+++ pkgsrc/lang/gcc48/Makefile  Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC48_DIST_VER
 ## 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 @@ CONFIGURE_ARGS+=     --with-local-prefix=${G
 
 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

Index: pkgsrc/lang/gcc48-libs/Makefile
diff -u pkgsrc/lang/gcc48-libs/Makefile:1.25 pkgsrc/lang/gcc48-libs/Makefile:1.26
--- pkgsrc/lang/gcc48-libs/Makefile:1.25        Thu Jun  1 13:30:25 2017
+++ pkgsrc/lang/gcc48-libs/Makefile     Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC48_DIS
 ## 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

Index: pkgsrc/lang/gcc49/Makefile
diff -u pkgsrc/lang/gcc49/Makefile:1.18 pkgsrc/lang/gcc49/Makefile:1.19
--- pkgsrc/lang/gcc49/Makefile:1.18     Thu Jun 22 21:44:49 2017
+++ pkgsrc/lang/gcc49/Makefile  Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC49_DIST_VER
 ## 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 @@ CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/
 ## 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}

Index: pkgsrc/lang/gcc49-libs/Makefile
diff -u pkgsrc/lang/gcc49-libs/Makefile:1.10 pkgsrc/lang/gcc49-libs/Makefile:1.11
--- pkgsrc/lang/gcc49-libs/Makefile:1.10        Thu Jun  1 13:30:25 2017
+++ pkgsrc/lang/gcc49-libs/Makefile     Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC49_DIS
 ## 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

Index: pkgsrc/lang/gcc5/Makefile
diff -u pkgsrc/lang/gcc5/Makefile:1.20 pkgsrc/lang/gcc5/Makefile:1.21
--- pkgsrc/lang/gcc5/Makefile:1.20      Fri Jul  7 14:52:30 2017
+++ pkgsrc/lang/gcc5/Makefile   Sun Jul  9 05:30:41 2017
@@ -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-shared
 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

Index: pkgsrc/lang/gcc5-libs/Makefile
diff -u pkgsrc/lang/gcc5-libs/Makefile:1.9 pkgsrc/lang/gcc5-libs/Makefile:1.10
--- pkgsrc/lang/gcc5-libs/Makefile:1.9  Thu Jun  1 13:30:25 2017
+++ pkgsrc/lang/gcc5-libs/Makefile      Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC5_DIST
 ## 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

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.9 pkgsrc/lang/gcc6/Makefile:1.10
--- pkgsrc/lang/gcc6/Makefile:1.9       Sat Jul  8 21:03:16 2017
+++ pkgsrc/lang/gcc6/Makefile   Sun Jul  9 05:30:41 2017
@@ -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-shared
 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

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.9 pkgsrc/lang/gcc7/Makefile:1.10
--- pkgsrc/lang/gcc7/Makefile:1.9       Fri Jul  7 14:52:31 2017
+++ pkgsrc/lang/gcc7/Makefile   Sun Jul  9 05:30:41 2017
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC7S_DIST_VER
 ## 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 @@ post-extract:
 .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: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index