pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang gcc8*: update to 8.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/109a4231938a
branches: trunk
changeset: 426889:109a4231938a
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Apr 08 06:39:57 2020 +0000
description:
gcc8*: update to 8.4.0
Changes not found. ~ one year of bug fixes on top of 8.3.0.
diffstat:
lang/gcc8-libs/Makefile | 4 +-
lang/gcc8/Makefile | 5 +-
lang/gcc8/buildlink3.mk | 7 +-
lang/gcc8/distinfo | 21 ++--
lang/gcc8/options.mk | 9 +-
lang/gcc8/patches/patch-fixincludes_fixincl.x | 65 +++++++++----
lang/gcc8/patches/patch-fixincludes_inclhack.def | 12 +-
lang/gcc8/patches/patch-gcc_config_netbsd-protos.h | 12 +-
lang/gcc8/patches/patch-gcc_config_t-netbsd | 9 +-
lang/gcc8/patches/patch-gcc_gimplify.c | 18 +++
lang/gcc8/patches/patch-libstdc++-v3_libsupc++_new__opa.cc | 10 +-
lang/gcc8/version.mk | 4 +-
12 files changed, 113 insertions(+), 63 deletions(-)
diffs (truncated from 375 to 300 lines):
diff -r eee96d2774ea -r 109a4231938a lang/gcc8-libs/Makefile
--- a/lang/gcc8-libs/Makefile Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8-libs/Makefile Wed Apr 08 06:39:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/04/01 14:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2020/04/08 06:39:57 wiz Exp $
GCC_PKGNAME= gcc8
.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/gcc8 package so that with the dependence pattern
## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
-PKGREVISION= 4
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= # empty
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/Makefile
--- a/lang/gcc8/Makefile Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/Makefile Wed Apr 08 06:39:57 2020 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2020/04/01 14:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2020/04/08 06:39:57 wiz Exp $
GCC_PKGNAME= gcc8
.include "version.mk"
DISTNAME= gcc-${GCC8_DIST_VERSION}
PKGNAME= ${GCC_PKGNAME}-${GCC8_DIST_VERSION}
-PKGREVISION= 3
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc8-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
@@ -48,7 +47,7 @@
SUBST_FILES.vars= gcc/Makefile.in
SUBST_VARS.vars= GCC_TARGET_MACHINE
-CHECK_PORTABILITY_SKIP+=contrib/*
+CHECK_PORTABILITY_SKIP+= contrib/*
.include "../../mk/bsd.prefs.mk"
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/buildlink3.mk
--- a/lang/gcc8/buildlink3.mk Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/buildlink3.mk Wed Apr 08 06:39:57 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/07/23 01:07:08 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/04/08 06:39:57 wiz Exp $
BUILDLINK_TREE+= gcc8
.if !defined(GCC8_BUILDLINK3_MK)
-GCC6SNAPSHOT_BUILDLINK3_MK:=
+GCC8_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gcc8+= gcc8>=${_GCC_REQD}
BUILDLINK_ABI_DEPENDS.gcc8+= gcc8>=8.0
@@ -25,5 +25,6 @@
.include "../../mk/pkg-build-options.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.endif # gcc8_BUILDLINK3_MK
+.endif # GCC8_BUILDLINK3_MK
+
BUILDLINK_TREE+= -gcc8
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/distinfo
--- a/lang/gcc8/distinfo Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/distinfo Wed Apr 08 06:39:57 2020 +0000
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.11 2019/10/19 21:20:38 minskim Exp $
+$NetBSD: distinfo,v 1.12 2020/04/08 06:39:57 wiz Exp $
-SHA1 (gcc-8.3.0.tar.xz) = c27f4499dd263fe4fb01bcc5565917f3698583b2
-RMD160 (gcc-8.3.0.tar.xz) = 59396f7136301466d0ec15eb7307558c0da692df
-SHA512 (gcc-8.3.0.tar.xz) = 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-Size (gcc-8.3.0.tar.xz) = 63694700 bytes
+SHA1 (gcc-8.4.0.tar.xz) = 00ddb177b04caffd40f7af0175d5b3c8e5442545
+RMD160 (gcc-8.4.0.tar.xz) = 4b3890e8865fae1d2b91166fb98e1097f5401d4a
+SHA512 (gcc-8.4.0.tar.xz) = 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
+Size (gcc-8.4.0.tar.xz) = 63713440 bytes
SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
Size (isl-0.16.1.tar.bz2) = 1626446 bytes
SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
-SHA1 (patch-fixincludes_fixincl.x) = e78103bbc1783f18e39cab5f31a73767617b2a79
-SHA1 (patch-fixincludes_inclhack.def) = 7bc5afb89118bf46c66a34a0f325f0748dd081db
+SHA1 (patch-fixincludes_fixincl.x) = f4d3504db0480f8a3443a684e0132a521a06b026
+SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
SHA1 (patch-gcc_config.gcc) = 4a971d1df7f05cfaefdf462d1b7c6dea1e838713
SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = b10ef4b9ad39e605fc4e2a0c8dffdae677842e94
@@ -19,11 +19,12 @@
SHA1 (patch-gcc_config_aarch64_t-aarch64-netbsd) = 29de4fe018f7cecf740bc596d8205f8980de5bfa
SHA1 (patch-gcc_config_arm_arm.h) = b668b6753e375e57bc4fbc3e5726f60f4808906e
SHA1 (patch-gcc_config_netbsd-elf.h) = e392918cce01627d64d4153329775c7ad03b4a45
-SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
-SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
+SHA1 (patch-gcc_config_netbsd-protos.h) = 54641de17fa2c9459497f57fd7fc1e23372b284c
+SHA1 (patch-gcc_config_t-netbsd) = 208a90f7127ad0a6a3573670b441af56716c1b1b
SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce
SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
+SHA1 (patch-gcc_gimplify.c) = 6f4fc96f0de1e0e96bc2e020aa352260d4270ba7
SHA1 (patch-gcc_ginclude_stddef.h) = fb1f83801e0f5bcec110667dc868c47ff2d10343
SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
SHA1 (patch-gcc_targhooks.c) = b28d8a9696d07bbfb00b7d8c55193ba99447ff1d
@@ -38,4 +39,4 @@
SHA1 (patch-libsanitizer_sanitizer__common_Makefile.in) = 62382c683e98bd8f2f27bd07ef01bdfadcdf256a
SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 1b907114f8b3477400fabc7b84ca5c16cd9c2930
SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = d498ce411dfcd57652f87957778fab66dd4ab9a0
-SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 7cbe0b3ca32371d6a0ad534e089ea530d5253620
+SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 4183b00a5ee6e61524da4755c825a0c08fd01ed6
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/options.mk
--- a/lang/gcc8/options.mk Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/options.mk Wed Apr 08 06:39:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/03 19:04:00 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2020/04/08 06:39:57 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -66,6 +66,7 @@
. if ${DELETE_INSTALLED_LIBGCC:Uno}
post-install: delete-installed-libgcc
+.PHONY: delete-installed-libgcc
delete-installed-libgcc:
${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete
@@ -118,9 +119,9 @@
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 = isl-0.16.1
-SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL16}.tar.bz2
+ISL16= isl-0.16.1
+SITES.${ISL16}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES+= ${ISL16}.tar.bz2
.endif
###
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/patches/patch-fixincludes_fixincl.x
--- a/lang/gcc8/patches/patch-fixincludes_fixincl.x Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/patches/patch-fixincludes_fixincl.x Wed Apr 08 06:39:57 2020 +0000
@@ -1,18 +1,41 @@
-$NetBSD: patch-fixincludes_fixincl.x,v 1.1 2019/10/19 21:20:38 minskim Exp $
+$NetBSD: patch-fixincludes_fixincl.x,v 1.2 2020/04/08 06:39:57 wiz Exp $
A workaround for Catalina SDK bug from
https://github.com/Homebrew/homebrew-core/pull/44762
---- fixincludes/fixincl.x.orig 2018-02-22 08:12:26.000000000 -0800
-+++ fixincludes/fixincl.x 2019-10-18 18:16:11.000000000 -0700
-@@ -2584,6 +2584,48 @@
+--- fixincludes/fixincl.x.orig 2020-03-04 08:29:59.000000000 +0000
++++ fixincludes/fixincl.x
+@@ -2,11 +2,11 @@
+ *
+ * DO NOT EDIT THIS FILE (fixincl.x)
+ *
+- * It has been AutoGen-ed January 1, 2020 at 12:04:04 PM by AutoGen 5.18.16
++ * It has been AutoGen-ed April 8, 2020 at 05:08:04 AM by AutoGen 5.18.10
+ * From the definitions inclhack.def
+ * and the template file fixincl
+ */
+-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jan 1 12:04:05 EST 2020
++/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Apr 8 05:08:04 GMT 2020
+ *
+ * You must regenerate it. Use the ./genfixes script.
+ *
+@@ -15,7 +15,7 @@
+ * certain ANSI-incompatible system header files which are fixed to work
+ * correctly with ANSI C and placed in a directory that GNU C will search.
+ *
+- * This file contains 255 fixup descriptions.
++ * This file contains 256 fixup descriptions.
+ *
+ * See README for more information.
+ *
+@@ -2589,6 +2589,48 @@ extern \"C\" {\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Darwin_Availability fix
+ */
+tSCC zDarwin_AvailabilityName[] =
-+ "darwin_availability";
++ "darwin_availability";
+
+/*
+ * File name selection pattern
@@ -51,38 +74,38 @@
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
- * Description of Darwin_9_Long_Double_Funcs_2 fix
+ * Description of Darwin_Availabilityinternal fix
*/
- tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
-@@ -10099,9 +10141,9 @@
+ tSCC zDarwin_AvailabilityinternalName[] =
+@@ -10356,9 +10398,9 @@ static const char* apzX11_SprintfPatch[]
*
* List of all fixes
*/
--#define REGEX_COUNT 287
-+#define REGEX_COUNT 288
+-#define REGEX_COUNT 294
++#define REGEX_COUNT 295
#define MACH_LIST_SIZE_LIMIT 187
--#define FIX_COUNT 249
-+#define FIX_COUNT 250
+-#define FIX_COUNT 255
++#define FIX_COUNT 256
/*
* Enumerate the fixes
-@@ -10168,6 +10210,7 @@
+@@ -10425,6 +10467,7 @@ typedef enum {
+ CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
++ DARWIN_AVAILABILITY_FIXIDX,
DARWIN_AVAILABILITYINTERNAL_FIXIDX,
-+ DARWIN_AVAILABILITY_FIXIDX,
DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
DARWIN_EXTERNC_FIXIDX,
- DARWIN_GCC4_BREAKAGE_FIXIDX,
-@@ -10664,6 +10707,11 @@
- DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aDarwin_AvailabilityinternalTests, apzDarwin_AvailabilityinternalPatch, 0 },
+@@ -10927,6 +10970,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+ CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 },
+ { zDarwin_AvailabilityName, zDarwin_AvailabilityList,
+ apzDarwin_AvailabilityMachs,
+ DARWIN_AVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_AvailabilityTests, apzDarwin_AvailabilityPatch, 0 },
+
- { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List,
- apzDarwin_9_Long_Double_Funcs_2Machs,
- DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ { zDarwin_AvailabilityinternalName, zDarwin_AvailabilityinternalList,
+ apzDarwin_AvailabilityinternalMachs,
+ DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/patches/patch-fixincludes_inclhack.def
--- a/lang/gcc8/patches/patch-fixincludes_inclhack.def Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/patches/patch-fixincludes_inclhack.def Wed Apr 08 06:39:57 2020 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-fixincludes_inclhack.def,v 1.1 2019/10/19 21:20:38 minskim Exp $
+$NetBSD: patch-fixincludes_inclhack.def,v 1.2 2020/04/08 06:39:57 wiz Exp $
A workaround for Catalina SDK bug from
https://github.com/Homebrew/homebrew-core/pull/44762
---- fixincludes/inclhack.def.orig 2018-02-22 08:12:26.000000000 -0800
-+++ fixincludes/inclhack.def 2019-10-18 18:17:01.000000000 -0700
-@@ -1268,6 +1268,28 @@
+--- fixincludes/inclhack.def.orig 2020-03-04 08:29:59.000000000 +0000
++++ fixincludes/inclhack.def
+@@ -1269,6 +1269,28 @@ fix = {
};
/*
@@ -31,6 +31,6 @@
+};
+
+/*
- * For the AAB_darwin7_9_long_double_funcs fix to be useful,
- * you have to not use "" includes.
+ * macOS 10.12 <AvailabilityInternal.h> uses __attribute__((availability))
+ * unconditionally.
*/
diff -r eee96d2774ea -r 109a4231938a lang/gcc8/patches/patch-gcc_config_netbsd-protos.h
--- a/lang/gcc8/patches/patch-gcc_config_netbsd-protos.h Wed Apr 08 06:14:46 2020 +0000
+++ b/lang/gcc8/patches/patch-gcc_config_netbsd-protos.h Wed Apr 08 06:39:57 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-gcc_config_netbsd-protos.h,v 1.1 2018/05/05 04:08:36 maya Exp $
+$NetBSD: patch-gcc_config_netbsd-protos.h,v 1.2 2020/04/08 06:39:57 wiz Exp $
---- /dev/null 2014-12-15 07:13:57.000000000 +0000
+--- gcc/config/netbsd-protos.h.orig 2020-03-04 08:30:00.000000000 +0000
+++ gcc/config/netbsd-protos.h
-@@ -0,0 +1,29 @@
-+/* Prototypes.
+@@ -1,4 +1,33 @@
+ /* Prototypes.
+ Copyright (C) 2001-2014 Free Software Foundation, Inc.
+
+This file is part of GCC.
@@ -32,3 +32,7 @@
+void netbsd_patch_builtins (void);
+
+#endif /* _NETBSD_PROTOS_H_ */
++/* Prototypes.
+ Copyright (C) 2017-2018 Free Software Foundation, Inc.
Home |
Main Index |
Thread Index |
Old Index