pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gcc48 lang/gcc48: disable libssp



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fced7930b4b
branches:  trunk
changeset: 352031:0fced7930b4b
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Sep 04 18:29:39 2016 +0000

description:
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

diffstat:

 lang/gcc48/Makefile                          |  11 ++++++++---
 lang/gcc48/distinfo                          |   3 ++-
 lang/gcc48/patches/patch-gcc_config_netbsd.h |  22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 05300609c025 -r 0fced7930b4b lang/gcc48/Makefile
--- a/lang/gcc48/Makefile       Sun Sep 04 16:54:13 2016 +0000
+++ b/lang/gcc48/Makefile       Sun Sep 04 18:29:39 2016 +0000
@@ -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-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}
 
diff -r 05300609c025 -r 0fced7930b4b lang/gcc48/distinfo
--- a/lang/gcc48/distinfo       Sun Sep 04 16:54:13 2016 +0000
+++ b/lang/gcc48/distinfo       Sun Sep 04 18:29:39 2016 +0000
@@ -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_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
diff -r 05300609c025 -r 0fced7930b4b lang/gcc48/patches/patch-gcc_config_netbsd.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc48/patches/patch-gcc_config_netbsd.h      Sun Sep 04 18:29:39 2016 +0000
@@ -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:                  \



Home | Main Index | Thread Index | Old Index