[pkgsrc/trunk]: pkgsrc/lang gcc{48, 49}: netbsd also provides libssp in libc, ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang gcc{48, 49}: netbsd also provides libssp in libc, ...
From: maya <maya%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:29:02 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fedb43cae81
branches:  trunk
changeset: 365082:4fedb43cae81
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Jul 10 15:55:40 2017 +0000

description:
gcc{48,49}: netbsd also provides libssp in libc, adjust LINK_SSP_SPEC accordingly.
already done for newer versions of gcc.

Now on netbsd all gcc packages can successfully build with -fstack-protector.

bump pkgrevision (sorry)

diffstat:

 lang/gcc48-libs/Makefile               |   4 ++--
 lang/gcc48/Makefile                    |   4 ++--
 lang/gcc48/distinfo                    |   4 ++--
 lang/gcc48/patches/patch-gcc_configure |  18 +++++++++++++++---
 lang/gcc49-libs/Makefile               |   4 ++--
 lang/gcc49/Makefile                    |   4 ++--
 lang/gcc49/distinfo                    |   4 ++--
 lang/gcc49/patches/patch-gcc_configure |  16 ++++++++++++++--
 8 files changed, 41 insertions(+), 17 deletions(-)

diffs (177 lines):

diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc48-libs/Makefile
--- a/lang/gcc48-libs/Makefile  Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc48-libs/Makefile  Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/07/09 05:30:41 maya Exp $
+# $NetBSD: Makefile,v 1.27 2017/07/10 15:55:40 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc48 package so that with the dependence pattern
 ## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48.
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    lang
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc48/Makefile
--- a/lang/gcc48/Makefile       Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc48/Makefile       Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/07/09 05:30:41 maya Exp $
+# $NetBSD: Makefile,v 1.36 2017/07/10 15:55:40 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "version.mk"
@@ -8,7 +8,7 @@
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc48-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-${GCC48_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc48/distinfo
--- a/lang/gcc48/distinfo       Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc48/distinfo       Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2017/05/28 01:00:20 maya Exp $
+$NetBSD: distinfo,v 1.35 2017/07/10 15:55:40 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -46,7 +46,7 @@
 SHA1 (patch-gcc_config_openbsd.opt) = 08b01bc4d7e171c3ee2ce5638a5859cff50c8ff8
 SHA1 (patch-gcc_config_sol2.h) = de6455ee88f281737501287759b7a83b8db05398
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
-SHA1 (patch-gcc_configure) = dcb136061bf36428d75b834ca53f0840a67ef186
+SHA1 (patch-gcc_configure) = 58f2688999a81a9cf1ef7c70f052f329e6b4fe7c
 SHA1 (patch-gcc_doc_gcc.texi) = 0b6ea28f887efc78ebd2f450c3f59ee7eaa15117
 SHA1 (patch-gcc_fortran_f95-lang.c) = 8dc0a1728fd0521caf71a4f5c2eb938340f20efa
 SHA1 (patch-gcc_ggc-common.c) = fa577bc25260d7e6304f166686ba51c0b677d7f6
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc48/patches/patch-gcc_configure
--- a/lang/gcc48/patches/patch-gcc_configure    Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc48/patches/patch-gcc_configure    Mon Jul 10 15:55:40 2017 +0000
@@ -1,12 +1,24 @@
-$NetBSD: patch-gcc_configure,v 1.3 2014/11/28 09:57:32 obache Exp $
+$NetBSD: patch-gcc_configure,v 1.4 2017/07/10 15:55:40 maya Exp $
 
 Add dl_iterate_phdr detection for FreeBSD and DragonFly.
 Detection for NetBSD and OpenBSD is added but commented out in case this
 error handling mechanism is activated for these platforms later.
 
+netbsd provides ssp in libc and doesn't build libssp, adjust ssp spec fragment
+for it too
+
 --- gcc/configure.orig 2014-04-28 10:05:29.000000000 +0000
 +++ gcc/configure
-@@ -26864,6 +26864,7 @@ else
+@@ -26886,7 +26886,7 @@ else
+        # simply assert that glibc does provide this, which is true for all
+        # realistically usable GNU/Hurd configurations.
+        gcc_cv_libc_provides_ssp=yes;;
+-       *-*-darwin* | *-*-freebsd*)
++       *-*-darwin* | *-*-freebsd* | *-*-netbsd*)
+        ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+ if test "x$ac_cv_func___stack_chk_fail" = x""yes; then :
+   gcc_cv_libc_provides_ssp=yes
+@@ -26895,6 +26895,7 @@ else
  fi
  
          ;;
@@ -14,7 +26,7 @@
    *) gcc_cv_libc_provides_ssp=no ;;
      esac
  fi
-@@ -26936,6 +26937,20 @@ case "$target" in
+@@ -26967,6 +26968,20 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc49-libs/Makefile
--- a/lang/gcc49-libs/Makefile  Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc49-libs/Makefile  Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/09 05:30:41 maya Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/10 15:55:40 maya Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## 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=   3
+PKGREVISION=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc49/Makefile
--- a/lang/gcc49/Makefile       Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc49/Makefile       Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/07/09 05:30:41 maya Exp $
+# $NetBSD: Makefile,v 1.20 2017/07/10 15:55:40 maya Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "version.mk"
@@ -9,7 +9,7 @@
 ## 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}/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc49/distinfo
--- a/lang/gcc49/distinfo       Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc49/distinfo       Mon Jul 10 15:55:40 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2017/05/28 01:42:03 maya Exp $
+$NetBSD: distinfo,v 1.13 2017/07/10 15:55:40 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -20,7 +20,7 @@
 SHA1 (patch-gcc_config_netbsd-stdint.h) = fc430c80adda9d3f58eea47816338f697a659889
 SHA1 (patch-gcc_config_netbsd.h) = 1d21dbe5082dd149d59dbc471d4148d0651df7d4
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
-SHA1 (patch-gcc_configure) = eb52890725d2eabb200275b6cb61fd86d976ee31
+SHA1 (patch-gcc_configure) = b925cb971ec547a9c25b518927493a168391d7da
 SHA1 (patch-gcc_fortran_f95-lang.c) = 9dbac16c146821eed9b06e1e9f0da85ff5c4ee75
 SHA1 (patch-gcc_ggc-common.c) = fa577bc25260d7e6304f166686ba51c0b677d7f6
 SHA1 (patch-gcc_ginclude_stddef.h) = 8af3e4b4058fc623c61e91f5771699f0ce679957
diff -r 7bdb33add735 -r 4fedb43cae81 lang/gcc49/patches/patch-gcc_configure
--- a/lang/gcc49/patches/patch-gcc_configure    Mon Jul 10 14:02:47 2017 +0000
+++ b/lang/gcc49/patches/patch-gcc_configure    Mon Jul 10 15:55:40 2017 +0000
@@ -1,12 +1,24 @@
-$NetBSD: patch-gcc_configure,v 1.1 2014/09/04 18:43:11 jperkin Exp $
+$NetBSD: patch-gcc_configure,v 1.2 2017/07/10 15:55:40 maya Exp $
 
 Add dl_iterate_phdr detection for FreeBSD and DragonFly.
 Detection for NetBSD and OpenBSD is added but commented out in case this
 error handling mechanism is activated for these platforms later.
 
+netbsd provides ssp in libc and doesn't build libssp, adjust ssp spec fragment
+for it too
+
 --- gcc/configure.orig 2014-05-28 11:37:50.000000000 +0000
 +++ gcc/configure
-@@ -27449,6 +27449,20 @@ case "$target" in
+@@ -27513,7 +27513,7 @@ fi
+        # simply assert that glibc does provide this, which is true for all
+        # realistically usable GNU/Hurd configurations.
+        gcc_cv_libc_provides_ssp=yes;;
+-       *-*-darwin* | *-*-freebsd*)
++       *-*-darwin* | *-*-freebsd* | *-*-netbsd*)
+        ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+ if test "x$ac_cv_func___stack_chk_fail" = x""yes; then :
+   gcc_cv_libc_provides_ssp=yes
+@@ -27601,6 +27601,20 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc gcc, again...
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc Add Xapian language bindings for C#, Lua, Per...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc gcc, again...
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc Add Xapian language bindings for C#, Lua, Per...
Indexes:
Home | Main Index | Thread Index | Old Index