CVS commit: pkgsrc/lang

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Sep  6 05:08:48 UTC 2016

Modified Files:
        pkgsrc/lang/gcc5: Makefile distinfo
        pkgsrc/lang/gcc5-libs: Makefile
        pkgsrc/lang/gcc5/patches: patch-gcc_config_netbsd.h

Log Message:
gcc5: netbsd-only: unconditionally disable libssp, use a saner specfile.

because we unconditionally disable libssp, we don't need the workaround
for ssp.h not found, so we can remove that part of that makefile.

bump gcc5 PKGREVISION
bump gcc5-libs PKGREVISION further than gcc5.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gcc5/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc5/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc5-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h

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

Modified files:

Index: pkgsrc/lang/gcc5/Makefile
diff -u pkgsrc/lang/gcc5/Makefile:1.12 pkgsrc/lang/gcc5/Makefile:1.13
--- pkgsrc/lang/gcc5/Makefile:1.12      Sat Jul  9 06:38:25 2016
+++ pkgsrc/lang/gcc5/Makefile   Tue Sep  6 05:08:48 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/06 05:08:48 maya Exp $
 
 GCC_PKGNAME=           gcc5
-PKGREVISION=           1
+PKGREVISION=           2
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC5_DIST_VERSION}
@@ -65,14 +65,6 @@ BOOT_LDFLAGS+=               ${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=  rm:-stdlib=libc++
 
-# Avoid ssp.h not found error.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-SUBST_CLASSES+=                fixinc
-SUBST_STAGE.fixinc=    pre-configure
-SUBST_FILES.fixinc=    gcc/Makefile.in
-SUBST_SED.fixinc=      -e "s,\./fixinc.sh,-c true,"
-.endif
-
 .include "options.mk"
 
 ## For graphite support.
@@ -90,8 +82,8 @@ CONFIGURE_ARGS+=      --enable-languages=${LA
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --enable-long-long
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) && ${PKGSRC_USE_SSP:Uno} != "no"
-# on NetBSD with stack protector, use the native SSP code in libc
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+# on NetBSD, use the native SSP code in libc
 CONFIGURE_ARGS+=       --disable-libssp
 .else
 CONFIGURE_ARGS+=       --enable-libssp

Index: pkgsrc/lang/gcc5/distinfo
diff -u pkgsrc/lang/gcc5/distinfo:1.10 pkgsrc/lang/gcc5/distinfo:1.11
--- pkgsrc/lang/gcc5/distinfo:1.10      Tue Jul  5 18:55:08 2016
+++ pkgsrc/lang/gcc5/distinfo   Tue Sep  6 05:08:48 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/07/05 18:55:08 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2016/09/06 05:08:48 maya Exp $
 
 SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115
 RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4
@@ -15,7 +15,7 @@ SHA1 (patch-gcc_config_host-netbsd.c) = 
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 9d1327f926dece6e753093e759b5c8b707747ae1
-SHA1 (patch-gcc_config_netbsd.h) = b722614a3822e9800a2a8f65a87e56927d05a1b1
+SHA1 (patch-gcc_config_netbsd.h) = 47e1b5d09d0529de00163ad70f47278b82a668b3
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = d6cc6a0bd257829ca2fd077a852fc447acaa63a0

Index: pkgsrc/lang/gcc5-libs/Makefile
diff -u pkgsrc/lang/gcc5-libs/Makefile:1.6 pkgsrc/lang/gcc5-libs/Makefile:1.7
--- pkgsrc/lang/gcc5-libs/Makefile:1.6  Tue Jul  5 18:55:08 2016
+++ pkgsrc/lang/gcc5-libs/Makefile      Tue Sep  6 05:08:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/05 18:55:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2016/09/06 05:08:48 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=   1
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h
diff -u pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h:1.1 pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h:1.2
--- pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h:1.1      Thu Jul 16 12:03:36 2015
+++ pkgsrc/lang/gcc5/patches/patch-gcc_config_netbsd.h  Tue Sep  6 05:08:48 2016
@@ -1,6 +1,9 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2016/09/06 05:08:48 maya Exp $
 
---- gcc/config/netbsd.h.orig   2014-01-02 22:23:26.000000000 +0000
+when using shared, link against libc
+another unexplained change
+
+--- gcc/config/netbsd.h.orig   2015-01-05 12:33:28.000000000 +0000
 +++ gcc/config/netbsd.h
 @@ -17,6 +17,9 @@ You should have received a copy of the G
  along with GCC; see the file COPYING3.  If not see
@@ -12,7 +15,23 @@ $NetBSD: patch-gcc_config_netbsd.h,v 1.1
  /* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets.  */
  #define NETBSD_OS_CPP_BUILTINS_COMMON()               \
    do                                          \
-@@ -175,3 +178,9 @@ along with GCC; see the file COPYING3.  
+@@ -96,6 +99,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}                \
+      %{p:-lposix_p}           \
+      %{pg:-lposix_p}}         \
++   %{shared:-lc}              \
+    %{!shared:                 \
+      %{!symbolic:             \
+        %{!p:                  \
+@@ -109,6 +113,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}                \
+      %{p:-lposix_p}           \
+      %{pg:-lposix_p}}         \
++   %{shared:-lc}              \
+    %{!shared:                 \
+      %{!symbolic:             \
+        %{!p:                  \
+@@ -175,3 +180,9 @@ along with GCC; see the file COPYING3.  
  
  #undef WINT_TYPE
  #define WINT_TYPE "int"