CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Sep  5 20:17:01 UTC 2016

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

Log Message:
gcc49 netbsd-only: disable libssp, use a more sane specfile.

bump gcc49 PKGREVISION
bump gcc49-libs so it is a higher PKGREVISION than gcc49


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc49/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc49/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc49-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc49/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/gcc49/Makefile
diff -u pkgsrc/lang/gcc49/Makefile:1.11 pkgsrc/lang/gcc49/Makefile:1.12
--- pkgsrc/lang/gcc49/Makefile:1.11     Sat Jul  9 06:38:25 2016
+++ pkgsrc/lang/gcc49/Makefile  Mon Sep  5 20:17:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/05 20:17:01 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=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/}
@@ -70,11 +70,16 @@ 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
+.else
+CONFIGURE_ARGS+=        --enable-libssp
+.endif
+
 CONFIGURE_ARGS+=       --enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --enable-long-long
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=       --enable-libssp
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 

Index: pkgsrc/lang/gcc49/distinfo
diff -u pkgsrc/lang/gcc49/distinfo:1.9 pkgsrc/lang/gcc49/distinfo:1.10
--- pkgsrc/lang/gcc49/distinfo:1.9      Tue Nov  3 22:50:35 2015
+++ pkgsrc/lang/gcc49/distinfo  Mon Sep  5 20:17:01 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 22:50:35 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/09/05 20:17:01 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -18,6 +18,7 @@ SHA1 (patch-gcc_config_dragonfly.opt) = 
 SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5
 SHA1 (patch-gcc_config_i386_dragonfly.h) = 5756b62791273f77866f06be1df0c267dc90a2ee
 SHA1 (patch-gcc_config_netbsd-stdint.h) = fc430c80adda9d3f58eea47816338f697a659889
+SHA1 (patch-gcc_config_netbsd.h) = 086b593cf9f05e654df9e1a527485ca727ec44cc
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = eb52890725d2eabb200275b6cb61fd86d976ee31
 SHA1 (patch-gcc_fortran_f95-lang.c) = 9dbac16c146821eed9b06e1e9f0da85ff5c4ee75

Index: pkgsrc/lang/gcc49-libs/Makefile
diff -u pkgsrc/lang/gcc49-libs/Makefile:1.6 pkgsrc/lang/gcc49-libs/Makefile:1.7
--- pkgsrc/lang/gcc49-libs/Makefile:1.6 Thu Jan 21 11:53:46 2016
+++ pkgsrc/lang/gcc49-libs/Makefile     Mon Sep  5 20:17:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/21 11:53:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2016/09/05 20:17:01 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=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Added files:

Index: pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h
diff -u /dev/null pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h:1.1
--- /dev/null   Mon Sep  5 20:17:01 2016
+++ pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h Mon Sep  5 20:17:01 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/05 20:17:01 maya Exp $
+
+when using shared, link against libc.
+
+--- gcc/config/netbsd.h.orig   2013-01-10 20:38:27.000000000 +0000
++++ gcc/config/netbsd.h
+@@ -96,6 +96,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}                \
+      %{p:-lposix_p}           \
+      %{pg:-lposix_p}}         \
++   %{shared:-lc}              \
+    %{!shared:                 \
+      %{!symbolic:             \
+        %{!p:                  \
+@@ -109,6 +110,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}                \
+      %{p:-lposix_p}           \
+      %{pg:-lposix_p}}         \
++   %{shared:-lc}              \
+    %{!shared:                 \
+      %{!symbolic:             \
+        %{!p:                  \