CVS commit: pkgsrc/lang/gcc48

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep  4 18:29:39 UTC 2016

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

Log Message:
lang/gcc48: disable libssp
netbsd only: link against libc when building shared.

libssp is broken as it has headers like ssp/stdio.h which include
<ssp.h>, when only ssp/ssp.h exists.
simply building hello world (including stdio.h) with -D_FORTIFY_SOURCE
will fail.

netbsd building of shared was broken as it did not link against libc when
making shared. adjust the spec file so it will do this.

bump PKGREVISION

XXX - all the other versions of GCC likely need the same

thanks joerg for the help


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/gcc48/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/gcc48/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc48/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/gcc48/Makefile
diff -u pkgsrc/lang/gcc48/Makefile:1.25 pkgsrc/lang/gcc48/Makefile:1.26
--- pkgsrc/lang/gcc48/Makefile:1.25     Sat Jul  9 06:38:25 2016
+++ pkgsrc/lang/gcc48/Makefile  Sun Sep  4 18:29:39 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2016/09/04 18:29:39 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "version.mk"
-PKGREVISION=   2
+PKGREVISION=   3
 
 DISTNAME=      gcc-${GCC48_DIST_VERSION}
 PKGNAME=       ${GCC_PKGNAME}-${GCC48_DIST_VERSION}
@@ -75,7 +75,12 @@ CONFIGURE_ARGS+=     --enable-languages=${LA
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --enable-long-long
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=       --enable-libssp
+
+# [2016-09 maya] including <stdio.h> and building with -D_FORTIFY_SOURCE
+# failsbecause ssp/stdio.h tries tp includes ssp.h, instead of ssp/ssp.h
+# + other failures, if this is corrected.
+CONFIGURE_ARGS+=       --disable-libssp
+
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 

Index: pkgsrc/lang/gcc48/distinfo
diff -u pkgsrc/lang/gcc48/distinfo:1.28 pkgsrc/lang/gcc48/distinfo:1.29
--- pkgsrc/lang/gcc48/distinfo:1.28     Tue Nov  3 22:50:35 2015
+++ pkgsrc/lang/gcc48/distinfo  Sun Sep  4 18:29:39 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2015/11/03 22:50:35 agc Exp $
+$NetBSD: distinfo,v 1.29 2016/09/04 18:29:39 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -39,6 +39,7 @@ SHA1 (patch-gcc_config_i386_dragonfly.h)
 SHA1 (patch-gcc_config_i386_openbsd.h) = df5b85b5957392138f99085bd8ebeb923e37e9e7
 SHA1 (patch-gcc_config_i386_openbsdelf.h) = 74498a1bd7c339c90b847740d3c474ad3ca4a956
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
+SHA1 (patch-gcc_config_netbsd.h) = 086b593cf9f05e654df9e1a527485ca727ec44cc
 SHA1 (patch-gcc_config_openbsd-libpthread.h) = 5043cf383fb68ff37b0cae22e61a97e26cff899e
 SHA1 (patch-gcc_config_openbsd.h) = 0090d48281c4973a18e8a70b2be9d2e999cca0a6
 SHA1 (patch-gcc_config_openbsd.opt) = 08b01bc4d7e171c3ee2ce5638a5859cff50c8ff8

Added files:

Index: pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h
diff -u /dev/null pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h:1.1
--- /dev/null   Sun Sep  4 18:29:39 2016
+++ pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h Sun Sep  4 18:29:39 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/04 18:29:39 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:                  \