CVS commit: pkgsrc/lang/gcc49

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun May 28 01:42:03 UTC 2017

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

Log Message:
gcc49: on netbsd, always link against libgcc. from Krister Walfridsson

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gcc49/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc49/distinfo
cvs rdiff -u -r1.1 -r1.2 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.14 pkgsrc/lang/gcc49/Makefile:1.15
--- pkgsrc/lang/gcc49/Makefile:1.14     Sat Apr 22 12:22:01 2017
+++ pkgsrc/lang/gcc49/Makefile  Sun May 28 01:42:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/04/22 12:22:01 maya Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/28 01:42:03 maya Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "version.mk"
@@ -9,8 +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=
-
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/lang/gcc49/distinfo
diff -u pkgsrc/lang/gcc49/distinfo:1.11 pkgsrc/lang/gcc49/distinfo:1.12
--- pkgsrc/lang/gcc49/distinfo:1.11     Tue Sep  6 12:37:47 2016
+++ pkgsrc/lang/gcc49/distinfo  Sun May 28 01:42:03 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/09/06 12:37:47 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2017/05/28 01:42:03 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -18,7 +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_netbsd.h) = 1d21dbe5082dd149d59dbc471d4148d0651df7d4
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = eb52890725d2eabb200275b6cb61fd86d976ee31
 SHA1 (patch-gcc_fortran_f95-lang.c) = 9dbac16c146821eed9b06e1e9f0da85ff5c4ee75

Index: pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h
diff -u pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h:1.1 pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h:1.2
--- pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h:1.1     Mon Sep  5 20:17:01 2016
+++ pkgsrc/lang/gcc49/patches/patch-gcc_config_netbsd.h Sun May 28 01:42:03 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/05 20:17:01 maya Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2017/05/28 01:42:03 maya Exp $
 
 when using shared, link against libc.
+always link against libgcc
 
---- 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}}                \
@@ -20,3 +20,12 @@ when using shared, link against libc.
     %{!shared:                 \
       %{!symbolic:             \
         %{!p:                  \
+@@ -133,7 +135,7 @@ along with GCC; see the file COPYING3.  
+      %{p: -lgcc_p}            \
+      %{pg: -lgcc_p}}"
+ #else
+-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
++#define NETBSD_LIBGCC_SPEC "-lgcc"
+ #endif
+ 
+ #undef LIBGCC_SPEC