CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  1 14:35:19 UTC 2020

Modified Files:
        pkgsrc/lang/gcc8: Makefile
        pkgsrc/lang/gcc8-libs: Makefile

Log Message:
gcc8*: reduce differences to gcc7*

This also fixes RELRO builds.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/gcc8/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc8-libs/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/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.16 pkgsrc/lang/gcc8/Makefile:1.17
--- pkgsrc/lang/gcc8/Makefile:1.16      Mon Mar 23 10:37:00 2020
+++ pkgsrc/lang/gcc8/Makefile   Wed Apr  1 14:35:19 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2020/03/23 10:37:00 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2020/04/01 14:35:19 wiz Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC8_DIST_VERSION}
 PKGNAME=       ${GCC_PKGNAME}-${GCC8_DIST_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc8-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
@@ -23,7 +23,7 @@ EXTRACT_ONLY=         ${DEFAULT_DISTFILES}
 
 NOT_FOR_PLATFORM=      Interix-*-*
 
-USE_LANGUAGES=         c c++
+USE_LANGUAGES=         c99 c++
 USE_TOOLS+=            gmake makeinfo sed:run tar:build
 USE_TOOLS.NetBSD+=     gsed
 
@@ -38,7 +38,6 @@ GCC_PREFIX=           ${PREFIX}/${GCC_SUBPREFIX}
 GNU_CONFIGURE_PREFIX=  ${GCC_PREFIX}
 INFO_FILES=            yes
 CONFIGURE_ARGS+=       --disable-libstdcxx-pch
-CHECK_PORTABILITY_SKIP+=contrib/*
 
 UNLIMIT_RESOURCES+=    datasize
 UNLIMIT_RESOURCES+=    stacksize
@@ -49,6 +48,7 @@ SUBST_STAGE.vars=     pre-configure
 SUBST_FILES.vars=      gcc/Makefile.in
 SUBST_VARS.vars=       GCC_TARGET_MACHINE
 
+CHECK_PORTABILITY_SKIP+=contrib/*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -58,7 +58,7 @@ LANGS=                        c
 LINKER_RPATH_FLAG:=    ${LINKER_RPATH_FLAG:S/-rpath/& /}
 
 ## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET=    ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
+LDFLAGS_FOR_TARGET=    ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} ${LDFLAGS:M-Wl,-z*}
 
 # The "-static-libstdc++ -static-libgcc" flags are normally added to the
 # boot-ldflags by configure but because we are supply the boot-ldflags
@@ -115,16 +115,13 @@ CONFIGURE_ARGS.Darwin+=   --disable-multil
 .if !empty(OSX_SDK_PATH)
 CONFIGURE_ARGS.Darwin+=        --with-sysroot=${OSX_SDK_PATH}
 .endif
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=       --with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=             ac_cv_func_clock_gettime=yes
-MAKE_ENV+=             ac_cv_func_gethostbyname_r=no
-MAKE_ENV+=             ac_cv_func_freelocale=no
-MAKE_ENV+=             ac_cv_func_newlocale=no
-MAKE_ENV+=             ac_cv_func_uselocale=no
-.endif
-
+CONFIGURE_ARGS.NetBSD+=        --with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=        --with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=      ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=      ac_cv_func_gethostbyname_r=no
+MAKE_ENV.NetBSD+=      ac_cv_func_freelocale=no
+MAKE_ENV.NetBSD+=      ac_cv_func_newlocale=no
+MAKE_ENV.NetBSD+=      ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
@@ -141,7 +138,6 @@ CONFIGURE_ARGS+=    --with-arch=nocona --wi
 CONFIGURE_ARGS+=       --with-dwarf2
 .endif
 
-
 # ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
 # a binary so we need to make sure we give it the installed sed and not
 # the tool wrapped one.
@@ -185,7 +181,7 @@ TEST_DEPENDS+=      dejagnu-[0-9]*:../../deve
 post-test:
        ${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&          \
        ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
-       @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
+       ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
 
 post-install:
        ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
@@ -196,8 +192,8 @@ post-install:
 .endif
 
 GENERATE_PLIST+= \
-       cd ${DESTDIR}${PREFIX} &&                                       \
-       ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
+       cd ${DESTDIR}${PREFIX} && \
+       ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 
 CHECK_BUILTIN.zlib:=   yes
 .include "../../devel/zlib/builtin.mk"

Index: pkgsrc/lang/gcc8-libs/Makefile
diff -u pkgsrc/lang/gcc8-libs/Makefile:1.7 pkgsrc/lang/gcc8-libs/Makefile:1.8
--- pkgsrc/lang/gcc8-libs/Makefile:1.7  Sat Jan 18 23:32:43 2020
+++ pkgsrc/lang/gcc8-libs/Makefile      Wed Apr  1 14:35:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/18 23:32:43 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/01 14:35:19 wiz Exp $
 
 GCC_PKGNAME=   gcc8
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC8_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc8 package so that with the dependence pattern
 ## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
-PKGREVISION=   3
+PKGREVISION=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -44,15 +44,15 @@ SHLIB_EXT=  so
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
-                              ${LIBRARY_FILES};
+                       ${LIBRARY_FILES};
 GENERATE_PLIST+=       ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
-                       ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+                       ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib';
 
 ${LIBRARY_FILES}:
-       ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC8_DIST_VERSION}*' |                \
+       ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC8_DIST_VERSION}*' |        \
        ${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d'           \
                -e'/libgij/d;/libgcj/d;/libjvm/d'                       \
-               -e'/lib.*\.${SHLIB_EXT}/p'              >${LIBRARY_FILES}
+               -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES}
 
 do-install: ${LIBRARY_FILES}
        ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib ||      \