pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gcc7snapshot: update to 20170420 snapshot.

Module Name:	pkgsrc-wip
Committed By:	coypoop <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sat Apr 22 16:41:49 2017 +0300
Changeset:	0d02d2aaf4328d232e777e555dea3ce3c7e147ee

Modified Files:
	gcc7snapshot/Makefile
	gcc7snapshot/distinfo
	gcc7snapshot/options.mk
	gcc7snapshot/patches/patch-gcc_Makefile.in
	gcc7snapshot/patches/patch-libgcc_crtstuff.c
	gcc7snapshot/version.mk
Added Files:
	gcc7snapshot/patches/patch-contrib_download__prerequisites
	gcc7snapshot/patches/patch-isl_configure
Removed Files:
	gcc7snapshot/patches/patch-libgcc_unwind-dw2-fde-dip.c

Log Message:
gcc7snapshot: update to 20170420 snapshot.

notable changes to package: switch to using isl 0.16.1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0d02d2aaf4328d232e777e555dea3ce3c7e147ee

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc7snapshot/Makefile                              |  6 +++---
 gcc7snapshot/distinfo                              | 23 +++++++++++----------
 gcc7snapshot/options.mk                            |  7 ++++---
 .../patches/patch-contrib_download__prerequisites  | 15 ++++++++++++++
 gcc7snapshot/patches/patch-gcc_Makefile.in         |  6 +++---
 gcc7snapshot/patches/patch-isl_configure           | 24 ++++++++++++++++++++++
 gcc7snapshot/patches/patch-libgcc_crtstuff.c       |  9 ++++----
 .../patches/patch-libgcc_unwind-dw2-fde-dip.c      | 13 ------------
 gcc7snapshot/version.mk                            |  2 +-
 9 files changed, 66 insertions(+), 39 deletions(-)

diffs:
diff --git a/gcc7snapshot/Makefile b/gcc7snapshot/Makefile
index 80dd006c19..56dd634592 100644
--- a/gcc7snapshot/Makefile
+++ b/gcc7snapshot/Makefile
@@ -10,7 +10,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
 ## PKGREVISION of this package!
 #PKGREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=gcc/snapshots/${GCC7S_DIST_VERSION}/}
+#MASTER_SITES=	${MASTER_SITE_GNU:=gcc/snapshots/${GCC7S_DIST_VERSION}/}
 MASTER_SITES+=	ftp://ftp.fu-berlin.de/unix/languages/gcc/snapshots/${GCC7S_DIST_VERSION}/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -72,8 +72,8 @@ BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
 post-extract:
-	${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC}
-	${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
+	${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
+	${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
diff --git a/gcc7snapshot/distinfo b/gcc7snapshot/distinfo
index 9f9ccbf232..62d9682548 100644
--- a/gcc7snapshot/distinfo
+++ b/gcc7snapshot/distinfo
@@ -1,14 +1,15 @@
 $NetBSD: distinfo,v 1.23 2015/05/06 05:25:00 keckhardt Exp $
 
-SHA1 (gcc-7-20161218.tar.bz2) = a6cb832b190842986e9bd7e87592fa0984ee7cb0
-RMD160 (gcc-7-20161218.tar.bz2) = 985f6730deab6299ba42da3b07670e5b7dafafce
-SHA512 (gcc-7-20161218.tar.bz2) = 0a63e66ef98e61f298e0d8de5692af157bc5557e2ba11162539739db944090f4fe86519bc68a6c8e5f13cc68b7e67cf5b8297f75a2468048bd94d618297aaba6
-Size (gcc-7-20161218.tar.bz2) = 78918286 bytes
-SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
-RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
-SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
-Size (isl-0.14.tar.bz2) = 1399896 bytes
-SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf
+SHA1 (gcc-7-20170420.tar.bz2) = 6a9c9bc397bf6e8c39edc8af3fbe8da578a4c035
+RMD160 (gcc-7-20170420.tar.bz2) = 58ab8c87a1f78ec12135741844362089f0401e28
+SHA512 (gcc-7-20170420.tar.bz2) = b51581a185fc6c31464435d3836450878f53103dbd78b257f46bf26e8c6545e6f00dbb4e7a00a5c27dc4c437b8a4fc40a240ae3f5df21277b4b0a8f203f03e75
+Size (gcc-7-20170420.tar.bz2) = 79681877 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) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
+SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
 SHA1 (patch-gcc_config.gcc) = fea8288c22bb2c4dd44a5e77c8f92dee8f8f6b18
 SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
@@ -20,13 +21,13 @@ SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
+SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
 SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
-SHA1 (patch-libgcc_crtstuff.c) = d22dd1fb4a79aed2e7c2864f0bb00bcc338b3ab8
-SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 9c5e1823226521d11900b4d3b92c050d3941a1f6
+SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
 SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0
diff --git a/gcc7snapshot/options.mk b/gcc7snapshot/options.mk
index c5a15a7985..77587ea979 100644
--- a/gcc7snapshot/options.mk
+++ b/gcc7snapshot/options.mk
@@ -81,9 +81,10 @@ LIBS.SunOS+=		-lgmp
 ### Graphite Support
 ###
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL14 = isl-0.14
-SITES.${ISL14}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL14}.tar.bz2
+ISL16 = isl-0.16.1
+SITES.${ISL16}.tar.bz2 = ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
+#SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES += ${ISL16}.tar.bz2
 .endif
 
 ###
diff --git a/gcc7snapshot/patches/patch-contrib_download__prerequisites b/gcc7snapshot/patches/patch-contrib_download__prerequisites
new file mode 100644
index 0000000000..f317b7d4f6
--- /dev/null
+++ b/gcc7snapshot/patches/patch-contrib_download__prerequisites
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Non-portable test
+
+--- contrib/download_prerequisites.orig	2017-04-11 16:34:07.000000000 +0000
++++ contrib/download_prerequisites
+@@ -122,7 +122,7 @@ md5_check() {
+   md5_checksum_output=$(md5 -r "${file_to_check}")
+   # Grab the text before the first space
+   md5_checksum_detected="${md5_checksum_output%% *}"
+-  [ "${md5_checksum_expected}" == "${md5_checksum_detected}" ] \
++  [ "${md5_checksum_expected}" = "${md5_checksum_detected}" ] \
+     || die "Cannot verify integrity of possibly corrupted file ${file_to_check}"
+   echo "${file_to_check}: OK"
+ }
diff --git a/gcc7snapshot/patches/patch-gcc_Makefile.in b/gcc7snapshot/patches/patch-gcc_Makefile.in
index 1f714e95b2..8b5076271c 100644
--- a/gcc7snapshot/patches/patch-gcc_Makefile.in
+++ b/gcc7snapshot/patches/patch-gcc_Makefile.in
@@ -3,13 +3,13 @@ $NetBSD: patch-gcc_Makefile.in,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
 Add gcc libdir to a programs rpath so that _this gcc's_ support libraries
 are found.
 
---- gcc/Makefile.in.orig	2013-03-05 09:46:34.000000000 +0000
+--- gcc/Makefile.in.orig	2017-04-18 18:10:27.000000000 +0000
 +++ gcc/Makefile.in
-@@ -2027,6 +2027,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
+@@ -2112,6 +2112,7 @@ prefix.o: $(BASEVER)
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)//lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
diff --git a/gcc7snapshot/patches/patch-isl_configure b/gcc7snapshot/patches/patch-isl_configure
new file mode 100644
index 0000000000..3f904dc92b
--- /dev/null
+++ b/gcc7snapshot/patches/patch-isl_configure
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Make test portable
+
+--- isl/configure.orig	2016-01-14 17:26:10.000000000 +0000
++++ isl/configure
+@@ -17561,7 +17561,7 @@ else
+ fi
+ 
+ 
+- if test "x$with_int" == "ximath-32"; then
++ if test "x$with_int" = "ximath-32"; then
+   SMALL_INT_OPT_TRUE=
+   SMALL_INT_OPT_FALSE='#'
+ else
+@@ -17569,7 +17569,7 @@ else
+   SMALL_INT_OPT_FALSE=
+ fi
+ 
+-if test "x$with_int" == "ximath-32"; then :
++if test "x$with_int" = "ximath-32"; then :
+ 
+ 
+ $as_echo "#define USE_SMALL_INT_OPT /**/" >>confdefs.h
diff --git a/gcc7snapshot/patches/patch-libgcc_crtstuff.c b/gcc7snapshot/patches/patch-libgcc_crtstuff.c
index 123b2af309..cb36ae6a01 100644
--- a/gcc7snapshot/patches/patch-libgcc_crtstuff.c
+++ b/gcc7snapshot/patches/patch-libgcc_crtstuff.c
@@ -1,14 +1,13 @@
 $NetBSD: patch-libgcc_crtstuff.c,v 1.3 2014/11/04 09:09:28 keckhardt Exp $
 
---- libgcc/crtstuff.c.orig	2014-09-22 00:49:01.000000000 +0000
+--- libgcc/crtstuff.c.orig	2017-01-01 12:07:43.000000000 +0000
 +++ libgcc/crtstuff.c
-@@ -81,7 +81,8 @@ call_ ## FUNC (void)					\
+@@ -81,7 +81,7 @@ call_ ## FUNC (void)					\
  #endif
  
  #if defined(TARGET_DL_ITERATE_PHDR) && \
--   (defined(__DragonFly__) || defined(__FreeBSD__))
-+   (defined(__DragonFly__) || defined(__FreeBSD__) || \
-+   defined(__NetBSD__) || defined(__OpenBSD__))
+-   (defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__))
++   (defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  #define BSD_DL_ITERATE_PHDR_AVAILABLE
  #endif
   
diff --git a/gcc7snapshot/patches/patch-libgcc_unwind-dw2-fde-dip.c b/gcc7snapshot/patches/patch-libgcc_unwind-dw2-fde-dip.c
deleted file mode 100644
index a1b767104c..0000000000
--- a/gcc7snapshot/patches/patch-libgcc_unwind-dw2-fde-dip.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libgcc_unwind-dw2-fde-dip.c,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
-
---- libgcc/unwind-dw2-fde-dip.c.orig	2014-05-21 11:08:58.000000000 +0000
-+++ libgcc/unwind-dw2-fde-dip.c
-@@ -65,7 +65,7 @@
- #endif
- 
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
--    && defined(__OpenBSD__)
-+    && defined(__OpenBSD__) || defined(__NetBSD__)
- # define ElfW(type) Elf_##type
- # define USE_PT_GNU_EH_FRAME
- #endif
diff --git a/gcc7snapshot/version.mk b/gcc7snapshot/version.mk
index 53b2d0a6a1..b023366bbb 100644
--- a/gcc7snapshot/version.mk
+++ b/gcc7snapshot/version.mk
@@ -1,2 +1,2 @@
 # $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC7S_DIST_VERSION:=7-20161218
+GCC7S_DIST_VERSION:=7-20170420
Home | Main Index | Thread Index | Old Index