gcc7snapshot: update to 7-20161002

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gcc7snapshot: update to 7-20161002
From: coypu <coypu%sdf.org@localhost>
Date: Tue, 04 Oct 2016 07:41:22 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Tue Oct 4 10:41:22 2016 +0300
Changeset:	ea540a88245846553776413fb10a0228c05caed8

Modified Files:
	gcc7snapshot/Makefile
	gcc7snapshot/distinfo
	gcc7snapshot/options.mk
	gcc7snapshot/version.mk
Removed Files:
	gcc7snapshot/patches/patch-libjava_boehm.cc
	gcc7snapshot/patches/patch-libjava_configure
	gcc7snapshot/patches/patch-libjava_contrib_rebuild-gcj-db.in

Log Message:
gcc7snapshot: update to 7-20161002

remove gcc-java options, deleted upstream, all related options and
patches. goodbye!

disable libssp on netbsd, as with all the other gccs - conflicts with
base libssp.

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

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

diffstat:
 gcc7snapshot/Makefile                              | 14 +++---
 gcc7snapshot/distinfo                              | 11 ++---
 gcc7snapshot/options.mk                            | 52 +---------------------
 gcc7snapshot/patches/patch-libjava_boehm.cc        | 22 ---------
 gcc7snapshot/patches/patch-libjava_configure       | 17 -------
 .../patch-libjava_contrib_rebuild-gcj-db.in        | 29 ------------
 gcc7snapshot/version.mk                            |  2 +-
 7 files changed, 13 insertions(+), 134 deletions(-)

diffs:
diff --git a/gcc7snapshot/Makefile b/gcc7snapshot/Makefile
index a3205f6..95ea78c 100644
--- a/gcc7snapshot/Makefile
+++ b/gcc7snapshot/Makefile
@@ -76,6 +76,13 @@ post-extract:
 	${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
 .endif
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+# on NetBSD, use the native SSP code in libc
+CONFIGURE_ARGS+=	--disable-libssp
+.else
+CONFIGURE_ARGS+=	--enable-libssp
+.endif
+
 ## For target librarys and libjava programs.
 CONFIGURE_ENV+=		LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
 
@@ -83,7 +90,6 @@ CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=	--enable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
 .if ${OPSYS} == "NetBSD"
@@ -99,8 +105,6 @@ MAKE_ENV+=		ac_cv_func_uselocale=no
 CONFIGURE_ARGS+=	--disable-bootstrap
 .endif
 
-
-
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
 .endif
@@ -161,10 +165,6 @@ post-test:
 post-install:
 	${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
 		( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
-.if !empty(PKG_OPTIONS:Mgcc-java)
-	${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
-	${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
-.endif
 .if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
diff --git a/gcc7snapshot/distinfo b/gcc7snapshot/distinfo
index 2688481..dd15626 100644
--- a/gcc7snapshot/distinfo
+++ b/gcc7snapshot/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.23 2015/05/06 05:25:00 keckhardt Exp $
 
-SHA1 (gcc-7-20160925.tar.bz2) = 8db364b3bc60d2ac1b8d40a664c296c690fd9f29
-RMD160 (gcc-7-20160925.tar.bz2) = 3af293da64b140e88b87d852a74cc11f3c914e97
-SHA512 (gcc-7-20160925.tar.bz2) = 105d53280c5bff9d507e693e998bc0143337ee628e23ea5f5b09ee6bfd69e3dfe0df6ad3576fc503439db49b69b754c56b5f22d9ea9ae525b69888f2e7f33b53
-Size (gcc-7-20160925.tar.bz2) = 96699528 bytes
+SHA1 (gcc-7-20161002.tar.bz2) = 71467c119a0b29668fd6b1b9b1418ed2dbd8b21a
+RMD160 (gcc-7-20161002.tar.bz2) = 630f8876ce643a007b8f074071b9f62f19bbce89
+SHA512 (gcc-7-20161002.tar.bz2) = 45228954a73458009c812e2926b8bbd00e406c10b5cfc629dd0f3be9451376c074c9a95d7e24186198b3e793e247c17250500f128771ebb4b46c576fe79b4ccf
+Size (gcc-7-20161002.tar.bz2) = 78670634 bytes
 SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
 RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
@@ -29,9 +29,6 @@ SHA1 (patch-libgcc_crtstuff.c) = d22dd1fb4a79aed2e7c2864f0bb00bcc338b3ab8
 SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 9c5e1823226521d11900b4d3b92c050d3941a1f6
 SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
-SHA1 (patch-libjava_boehm.cc) = bf5564261b02523927685340f59ce8faf7f84ace
-SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
-SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297
 SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
diff --git a/gcc7snapshot/options.mk b/gcc7snapshot/options.mk
index b60e9f8..c5a15a7 100644
--- a/gcc7snapshot/options.mk
+++ b/gcc7snapshot/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
-			gcc-go gcc-objc gcc-objc++ gcc-graphite gcc-java
+			gcc-go gcc-objc gcc-objc++ gcc-graphite
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
 			gcc-graphite gcc-inplace-math
 
@@ -106,61 +106,11 @@ LANGS+=			obj-c++
 LANGS+=			objc
 .endif
 
-.if !empty(PKG_OPTIONS:Mgcc-java)
-.  if empty(PKG_OPTIONS:Mgcc-c++)
-PKG_OPTIONS+=		gcc-c++
-.  endif
-
-LANGS+=			java
-
-# Add the  Eclipse Java compiler for to parse `.java' source files.
-ECJ_JAR=		ecj-4.5.jar
-SITES.${ECJ_JAR}=	ftp://sourceware.org/pub/java/
-DISTFILES+=		${ECJ_JAR}
-CONFIGURE_ARGS+=	--with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
-
-JAVA_NAME=		${GCC_PKGNAME}
-JAVA_HOME=		${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS=		appletviewer jar jarsigner java javah keytool \
-			native2ascii orbd rmic rmid rmiregistry serialver \
-			tnameserv
-
-JAVA_ARCH=		${MACHINE_ARCH:S/x86_64/amd64/}
-
-PLIST_SRC+=		PLIST.java
-PLIST_SUBST+=		JAVA_NAME=${JAVA_NAME:Q}
-PLIST_SUBST+=		JAVA_ARCH=${JAVA_ARCH:Q}
-
-# Create a JPackage compatible SDK environment.
-CONFIGURE_ARGS+=	--enable-java-home
-CONFIGURE_ARGS+=	--with-os-directory=${LOWER_OPSYS:Q}
-CONFIGURE_ARGS+=	--with-arch-directory=${JAVA_ARCH:Q}
-CONFIGURE_ARGS+=	--with-jvm-root-dir=${JAVA_HOME:Q}
-CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME:Q}
-
-REPLACE_PYTHON=		libjava/contrib/aot-compile.in
-
 USE_TOOLS+=		unzip zip:run gmake:run
 CONFIGURE_ARGS+=	--with-system-zlib
 
-# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
-# we need to make sure we give it the installed 'make' and not the tool
-# wrapped one.
-CONFIGURE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
-MAKE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
-
-# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
-# failure (seen on NetBSD-5.0/i386) when building java.  So in case
-# the fastjar package is installed, make sure the configure script
-# doesn't pick it up.
-CONFIGURE_ENV+=		JAR=no
-MAKE_ENV+=		JAR=no
-MAKE_ENV+=		ac_cv_prog_JAR=no
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../mk/java-env.mk"
-.endif
 
 .if !empty(PKG_OPTIONS:Mgcc-go)
 LANGS+=			go
diff --git a/gcc7snapshot/patches/patch-libjava_boehm.cc b/gcc7snapshot/patches/patch-libjava_boehm.cc
deleted file mode 100644
index 9dc4ade..0000000
--- a/gcc7snapshot/patches/patch-libjava_boehm.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-libjava_boehm.cc,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
-
---- libjava/boehm.cc.orig	2014-05-20 18:02:20.000000000 +0000
-+++ libjava/boehm.cc
-@@ -748,7 +748,7 @@ _Jv_GCAttachThread ()
-   // only actually works if pthread_getattr_np is defined.
-   // FIXME: until gc7 it is simpler to disable this on solaris.
- #if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \
--    && !defined(GC_WIN32_THREADS)
-+    && !defined(__NetBSD__) && !defined(GC_WIN32_THREADS)
-   GC_register_my_thread ();
- #endif
- }
-@@ -757,7 +757,7 @@ void
- _Jv_GCDetachThread ()
- {
- #if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \
--    && !defined(GC_WIN32_THREADS)
-+    && !defined(__NetBSD__) && !defined(GC_WIN32_THREADS)
-   GC_unregister_my_thread ();
- #endif
- }
diff --git a/gcc7snapshot/patches/patch-libjava_configure b/gcc7snapshot/patches/patch-libjava_configure
deleted file mode 100644
index dc84aa6..0000000
--- a/gcc7snapshot/patches/patch-libjava_configure
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libjava_configure,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
-
-Avoid a reference to the wrapped make in the pkgsrc work directory from
-showing up in an installed file.
-See: libjava/contrib/aotcompile.py.in
-
---- libjava/configure.orig	2012-03-22 07:37:39.000000000 +0000
-+++ libjava/configure
-@@ -24692,7 +24692,7 @@ $as_echo "Python modules dir: ${python_m
- 
- 
- # needed for aot-compile-rpm
--MAKE=`which make`
-+MAKE=${PKGSRC_MAKE}
- 
- 
- # Check whether --enable-aot-compile-rpm was given.
diff --git a/gcc7snapshot/patches/patch-libjava_contrib_rebuild-gcj-db.in b/gcc7snapshot/patches/patch-libjava_contrib_rebuild-gcj-db.in
deleted file mode 100644
index fd2d06d..0000000
--- a/gcc7snapshot/patches/patch-libjava_contrib_rebuild-gcj-db.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-libjava_contrib_rebuild-gcj-db.in,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
-
-No need to use bash for this small script.
-
-Also -print0 is not portable to solaris and perhaps others.
-
---- libjava/contrib/rebuild-gcj-db.in.orig	2008-07-02 13:17:54.000000000 +0000
-+++ libjava/contrib/rebuild-gcj-db.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # rebuild-gcj-db
- 
- ## Copyright (C) 2000, 2002, 2003, 2008 Free Software Foundation
-@@ -16,12 +16,12 @@ for i in `@prefix@/bin/gcc --print-multi
-    base=@prefix@/lib/$dirname
-    dbLocation=`@prefix@/bin/gcj-dbtool -p $base`
-    libdir=$base/gcj
--   if ! test -d $libdir; then
-+   if test ! -d $libdir; then
-       # No shared libraries here.
-       continue
-    fi
-    dirname $dbLocation | xargs mkdir -p
-    @prefix@/bin/gcj-dbtool -n $dbLocation 64
--   find $libdir -follow -name '*.db' -print0 | \
-+   find $libdir -follow -name '*.db' -print | @AWK@ '{printf("%s%c", $1, 0);}'|\
-       @prefix@/bin/gcj-dbtool -0 -m $dbLocation $dbLocation
- done
diff --git a/gcc7snapshot/version.mk b/gcc7snapshot/version.mk
index a17ee29..5c51f87 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-20160925
+GCC7S_DIST_VERSION:=7-20161002
Prev by Date: nemo: Mark broken as troublesome
Next by Date: py-kyra: Drop, no upstream and tarballs?
Previous by Thread: nemo: Mark broken as troublesome
Next by Thread: py-kyra: Drop, no upstream and tarballs?
Indexes:
Home | Main Index | Thread Index | Old Index