pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang
Module Name: pkgsrc
Committed By: maya
Date: Mon Jul 10 15:55:40 UTC 2017
Modified Files:
pkgsrc/lang/gcc48: Makefile distinfo
pkgsrc/lang/gcc48-libs: Makefile
pkgsrc/lang/gcc48/patches: patch-gcc_configure
pkgsrc/lang/gcc49: Makefile distinfo
pkgsrc/lang/gcc49-libs: Makefile
pkgsrc/lang/gcc49/patches: patch-gcc_configure
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/gcc48/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/gcc48/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/gcc48-libs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc48/patches/patch-gcc_configure
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc49/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gcc49/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc49-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc49/patches/patch-gcc_configure
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.35 pkgsrc/lang/gcc48/Makefile:1.36
--- pkgsrc/lang/gcc48/Makefile:1.35 Sun Jul 9 05:30:41 2017
+++ pkgsrc/lang/gcc48/Makefile Mon Jul 10 15:55:40 2017
@@ -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 @@ PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VER
## 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
Index: pkgsrc/lang/gcc48/distinfo
diff -u pkgsrc/lang/gcc48/distinfo:1.34 pkgsrc/lang/gcc48/distinfo:1.35
--- pkgsrc/lang/gcc48/distinfo:1.34 Sun May 28 01:00:20 2017
+++ pkgsrc/lang/gcc48/distinfo Mon Jul 10 15:55:40 2017
@@ -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.h) = 0090
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
Index: pkgsrc/lang/gcc48-libs/Makefile
diff -u pkgsrc/lang/gcc48-libs/Makefile:1.26 pkgsrc/lang/gcc48-libs/Makefile:1.27
--- pkgsrc/lang/gcc48-libs/Makefile:1.26 Sun Jul 9 05:30:41 2017
+++ pkgsrc/lang/gcc48-libs/Makefile Mon Jul 10 15:55:40 2017
@@ -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 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIS
## 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
Index: pkgsrc/lang/gcc48/patches/patch-gcc_configure
diff -u pkgsrc/lang/gcc48/patches/patch-gcc_configure:1.3 pkgsrc/lang/gcc48/patches/patch-gcc_configure:1.4
--- pkgsrc/lang/gcc48/patches/patch-gcc_configure:1.3 Fri Nov 28 09:57:32 2014
+++ pkgsrc/lang/gcc48/patches/patch-gcc_configure Mon Jul 10 15:55:40 2017
@@ -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 @@ error handling mechanism is activated fo
*) 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
;;
Index: pkgsrc/lang/gcc49/Makefile
diff -u pkgsrc/lang/gcc49/Makefile:1.19 pkgsrc/lang/gcc49/Makefile:1.20
--- pkgsrc/lang/gcc49/Makefile:1.19 Sun Jul 9 05:30:41 2017
+++ pkgsrc/lang/gcc49/Makefile Mon Jul 10 15:55:40 2017
@@ -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 @@ 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}/}
EXTRACT_SUFX= .tar.bz2
Index: pkgsrc/lang/gcc49/distinfo
diff -u pkgsrc/lang/gcc49/distinfo:1.12 pkgsrc/lang/gcc49/distinfo:1.13
--- pkgsrc/lang/gcc49/distinfo:1.12 Sun May 28 01:42:03 2017
+++ pkgsrc/lang/gcc49/distinfo Mon Jul 10 15:55:40 2017
@@ -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_i386_dragonfly.h)
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
Index: pkgsrc/lang/gcc49-libs/Makefile
diff -u pkgsrc/lang/gcc49-libs/Makefile:1.11 pkgsrc/lang/gcc49-libs/Makefile:1.12
--- pkgsrc/lang/gcc49-libs/Makefile:1.11 Sun Jul 9 05:30:41 2017
+++ pkgsrc/lang/gcc49-libs/Makefile Mon Jul 10 15:55:40 2017
@@ -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 @@ 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= 3
+PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= # empty
Index: pkgsrc/lang/gcc49/patches/patch-gcc_configure
diff -u pkgsrc/lang/gcc49/patches/patch-gcc_configure:1.1 pkgsrc/lang/gcc49/patches/patch-gcc_configure:1.2
--- pkgsrc/lang/gcc49/patches/patch-gcc_configure:1.1 Thu Sep 4 18:43:11 2014
+++ pkgsrc/lang/gcc49/patches/patch-gcc_configure Mon Jul 10 15:55:40 2017
@@ -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
;;
Home |
Main Index |
Thread Index |
Old Index