gcc: => 7.1.0

12 files changed, 10 insertions, 238 deletions

diff --git a/gnu/gcc/0001-remove-libffi.patch b/gnu/gcc/0001-remove-libffi.patch
deleted file mode 100644
index 31d69fd24b..0000000000
--- a/gnu/gcc/0001-remove-libffi.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 1974f57c22229823dcde081f49e7d30e3fe4cd48 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-Date: Wed, 20 Mar 2013 11:25:28 +0100
-Subject: [PATCH] remove libffi
-
----
- Makefile.in | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 08049de..895b3ac 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -936,7 +936,6 @@ configure-target:  \
-     maybe-configure-target-libtermcap \
-     maybe-configure-target-winsup \
-     maybe-configure-target-libgloss \
--    maybe-configure-target-libffi \
-     maybe-configure-target-libjava \
-     maybe-configure-target-zlib \
-     maybe-configure-target-boehm-gc \
-@@ -1089,7 +1088,6 @@ all-target: maybe-all-target-libgo
- all-target: maybe-all-target-libtermcap
- all-target: maybe-all-target-winsup
- all-target: maybe-all-target-libgloss
--all-target: maybe-all-target-libffi
- all-target: maybe-all-target-libjava
- all-target: maybe-all-target-zlib
- all-target: maybe-all-target-boehm-gc
-@@ -1178,7 +1176,6 @@ info-target: maybe-info-target-libgo
- info-target: maybe-info-target-libtermcap
- info-target: maybe-info-target-winsup
- info-target: maybe-info-target-libgloss
--info-target: maybe-info-target-libffi
- info-target: maybe-info-target-libjava
- info-target: maybe-info-target-zlib
- info-target: maybe-info-target-boehm-gc
-@@ -1260,7 +1257,6 @@ dvi-target: maybe-dvi-target-libgo
- dvi-target: maybe-dvi-target-libtermcap
- dvi-target: maybe-dvi-target-winsup
- dvi-target: maybe-dvi-target-libgloss
--dvi-target: maybe-dvi-target-libffi
- dvi-target: maybe-dvi-target-libjava
- dvi-target: maybe-dvi-target-zlib
- dvi-target: maybe-dvi-target-boehm-gc
-@@ -1342,7 +1338,6 @@ pdf-target: maybe-pdf-target-libgo
- pdf-target: maybe-pdf-target-libtermcap
- pdf-target: maybe-pdf-target-winsup
- pdf-target: maybe-pdf-target-libgloss
--pdf-target: maybe-pdf-target-libffi
- pdf-target: maybe-pdf-target-libjava
- pdf-target: maybe-pdf-target-zlib
- pdf-target: maybe-pdf-target-boehm-gc
-@@ -1424,7 +1419,6 @@ html-target: maybe-html-target-libgo
- html-target: maybe-html-target-libtermcap
- html-target: maybe-html-target-winsup
- html-target: maybe-html-target-libgloss
--html-target: maybe-html-target-libffi
- html-target: maybe-html-target-libjava
- html-target: maybe-html-target-zlib
- html-target: maybe-html-target-boehm-gc
-@@ -1506,7 +1500,6 @@ TAGS-target: maybe-TAGS-target-libgo
- TAGS-target: maybe-TAGS-target-libtermcap
- TAGS-target: maybe-TAGS-target-winsup
- TAGS-target: maybe-TAGS-target-libgloss
--TAGS-target: maybe-TAGS-target-libffi
- TAGS-target: maybe-TAGS-target-libjava
- TAGS-target: maybe-TAGS-target-zlib
- TAGS-target: maybe-TAGS-target-boehm-gc
-@@ -1588,7 +1581,6 @@ install-info-target: maybe-install-info-target-libgo
- install-info-target: maybe-install-info-target-libtermcap
- install-info-target: maybe-install-info-target-winsup
- install-info-target: maybe-install-info-target-libgloss
--install-info-target: maybe-install-info-target-libffi
- install-info-target: maybe-install-info-target-libjava
- install-info-target: maybe-install-info-target-zlib
- install-info-target: maybe-install-info-target-boehm-gc
-@@ -1670,7 +1662,6 @@ install-pdf-target: maybe-install-pdf-target-libgo
- install-pdf-target: maybe-install-pdf-target-libtermcap
- install-pdf-target: maybe-install-pdf-target-winsup
- install-pdf-target: maybe-install-pdf-target-libgloss
--install-pdf-target: maybe-install-pdf-target-libffi
- install-pdf-target: maybe-install-pdf-target-libjava
- install-pdf-target: maybe-install-pdf-target-zlib
- install-pdf-target: maybe-install-pdf-target-boehm-gc
-@@ -1752,7 +1743,6 @@ install-html-target: maybe-install-html-target-libgo
- install-html-target: maybe-install-html-target-libtermcap
- install-html-target: maybe-install-html-target-winsup
- install-html-target: maybe-install-html-target-libgloss
--install-html-target: maybe-install-html-target-libffi
- install-html-target: maybe-install-html-target-libjava
- install-html-target: maybe-install-html-target-zlib
- install-html-target: maybe-install-html-target-boehm-gc
-@@ -1834,7 +1824,6 @@ installcheck-target: maybe-installcheck-target-libgo
- installcheck-target: maybe-installcheck-target-libtermcap
- installcheck-target: maybe-installcheck-target-winsup
- installcheck-target: maybe-installcheck-target-libgloss
--installcheck-target: maybe-installcheck-target-libffi
- installcheck-target: maybe-installcheck-target-libjava
- installcheck-target: maybe-installcheck-target-zlib
- installcheck-target: maybe-installcheck-target-boehm-gc
-@@ -1916,7 +1905,6 @@ mostlyclean-target: maybe-mostlyclean-target-libgo
- mostlyclean-target: maybe-mostlyclean-target-libtermcap
- mostlyclean-target: maybe-mostlyclean-target-winsup
- mostlyclean-target: maybe-mostlyclean-target-libgloss
--mostlyclean-target: maybe-mostlyclean-target-libffi
- mostlyclean-target: maybe-mostlyclean-target-libjava
- mostlyclean-target: maybe-mostlyclean-target-zlib
- mostlyclean-target: maybe-mostlyclean-target-boehm-gc
-@@ -1998,7 +1986,6 @@ clean-target: maybe-clean-target-libgo
- clean-target: maybe-clean-target-libtermcap
- clean-target: maybe-clean-target-winsup
- clean-target: maybe-clean-target-libgloss
--clean-target: maybe-clean-target-libffi
- clean-target: maybe-clean-target-libjava
- clean-target: maybe-clean-target-zlib
- clean-target: maybe-clean-target-boehm-gc
-@@ -2080,7 +2067,6 @@ distclean-target: maybe-distclean-target-libgo
- distclean-target: maybe-distclean-target-libtermcap
- distclean-target: maybe-distclean-target-winsup
- distclean-target: maybe-distclean-target-libgloss
--distclean-target: maybe-distclean-target-libffi
- distclean-target: maybe-distclean-target-libjava
- distclean-target: maybe-distclean-target-zlib
- distclean-target: maybe-distclean-target-boehm-gc
-@@ -2162,7 +2148,6 @@ maintainer-clean-target: maybe-maintainer-clean-target-libgo
- maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
- maintainer-clean-target: maybe-maintainer-clean-target-winsup
- maintainer-clean-target: maybe-maintainer-clean-target-libgloss
--maintainer-clean-target: maybe-maintainer-clean-target-libffi
- maintainer-clean-target: maybe-maintainer-clean-target-libjava
- maintainer-clean-target: maybe-maintainer-clean-target-zlib
- maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-@@ -2299,7 +2284,6 @@ check-target:  \
-     maybe-check-target-libtermcap \
-     maybe-check-target-winsup \
-     maybe-check-target-libgloss \
--    maybe-check-target-libffi \
-     maybe-check-target-libjava \
-     maybe-check-target-zlib \
-     maybe-check-target-boehm-gc \
-@@ -2454,7 +2438,6 @@ install-target:  \
-     maybe-install-target-libtermcap \
-     maybe-install-target-winsup \
-     maybe-install-target-libgloss \
--    maybe-install-target-libffi \
-     maybe-install-target-libjava \
-     maybe-install-target-zlib \
-     maybe-install-target-boehm-gc \
-@@ -2556,7 +2539,6 @@ install-strip-target:  \
-     maybe-install-strip-target-libtermcap \
-     maybe-install-strip-target-winsup \
-     maybe-install-strip-target-libgloss \
--    maybe-install-strip-target-libffi \
-     maybe-install-strip-target-libjava \
-     maybe-install-strip-target-zlib \
-     maybe-install-strip-target-boehm-gc \
--- 
-1.8.1.3
-
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 166b1444a6..ff34912d1a 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -3,13 +3,7 @@
 CFLAGS=${CFLAGS/-pipe/}     &&
 CXXFLAGS=${CXXFLAGS/-pipe/} &&
 
-if list_find "$GCC_COMPILER" "java"; then
-  OPTS+=" --enable-libgcj" &&
-  OPTS+=" --disable-plugin"
-else
-  OPTS+=" --disable-libgcj" &&
-  OPTS+=" --enable-plugin"
-fi &&
+OPTS+=" --enable-plugin" &&
 
 if list_find "$GCC_COMPILER" "fortran"; then
   OPTS+=" --enable-libquadmath"
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 24460d16b4..f676307324 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -8,9 +8,4 @@ config_query_list GCC_TARGET "Select what build to use" \
                               profiledbootstrap \
                               profiledbootstrap-lean    &&
 
-if list_find "$GCC_COMPILER" "java" ; then
-  config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and libart_lgpl)?" n &&
-  config_query_option GCJ_HOME "Add JDK Tree emulation?" n "--enable-java-home" ""
-fi &&
-
 config_query GCC_CLOOG "Use cloog loop vectorizer?" y
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 20095ebfbc..c3b1192c25 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,19 +1,5 @@
 . $GRIMOIRE/libcompat  &&
 depends perl &&
-if list_find "$GCC_COMPILER" "java" ; then
-  depends  unzip  &&
-  depends  zip  &&
-
-  if [[ $GCJ_AWT == y ]]; then
-    depends  glib2                          &&
-    depends  gtk+2 '--enable-java-awt=gtk'  &&
-    depends  libxt                          &&
-    depends  libx11                         &&
-    depends  xproto                         &&
-    depends  libart_lgpl                    &&
-    depends  libxtst
-  fi
-fi &&
 depends  diffutils       &&
 depends  gmp             &&
 depends  gnupg           &&
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index a90d692716..25eade301b 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gcc
-         VERSION=6.3.0
+         VERSION=7.1.0
  BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION"
           SOURCE=gcc-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
@@ -10,13 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 
-if list_find "$GCC_COMPILER" "java"; then
-#         SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar
-         SOURCE5=ecj-4.9.jar
-  SOURCE5_URL[0]=ftp://sourceware.org/pub/java/${SOURCE5}
-    SOURCE5_HASH=sha512:28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226
-fi
-
 if list_find "$GCC_COMPILER" "ada" ; then
 
 # howto generate the ada bootstraper
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 89a101627c..44dac85855 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,9 @@
+2017-05-02 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 7.1.0
+	* CONFIGURE PRE_BUILD DETAILS BUILD PRE_SUB_DEPENDS SUB_DEPENDS PREPARE DEPENDS:
+	  remove all java related stuff, as java has been removed from gcc-7
+	* PRE_BUILD: disbale some patches
+
 2016-12-21 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 6.3.0
 
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index 7efb177e0b..6d0fe6d79f 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -5,7 +5,6 @@ config_query_multi GCC_COMPILER "Select the additional compilers you want" \
                                 ada \
                                 fortran \
                                 go \
-                                java \
                                 objc \
                                 obj-c++ \
                                 all &&
@@ -15,7 +14,6 @@ if list_find "$GCC_COMPILER" "all" ; then
   list_add GCC_COMPILER ada      &&
   list_add GCC_COMPILER fortran  &&
   list_add GCC_COMPILER go       &&
-  list_add GCC_COMPILER java     &&
   list_add GCC_COMPILER objc     &&
   list_add GCC_COMPILER obj-c++
 fi
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index c75111c63a..9091459c7c 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -25,25 +25,12 @@ fi  &&
 cd ${SOURCE_DIRECTORY}          &&
 
 
-if list_find "$GCC_COMPILER" "java"; then
-  cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
-fi  &&
-
 mk_source_dir $SOURCE_DIRECTORY.bld  &&
 cd $SOURCE_DIRECTORY  &&
 
 sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
 
-patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
-
 if list_find "$GCC_COMPILER" "go"; then
   patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
-fi &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch" &&
-
-# Fix linking of libgcj
-cat >> libjava/Makefile.in <<-"!"
-	libgcj_la_LDFLAGS += $(LIBSTDCXX_RAW_CXX_LDFLAGS)
-!
+fi
diff --git a/gnu/gcc/PRE_SUB_DEPENDS b/gnu/gcc/PRE_SUB_DEPENDS
index a93b2c89cc..42ea3774a5 100755
--- a/gnu/gcc/PRE_SUB_DEPENDS
+++ b/gnu/gcc/PRE_SUB_DEPENDS
@@ -1,11 +1,9 @@
 case $THIS_SUB_DEPENDS in
       CXX) true                                    ;;
-     JAVA) list_find "$GCC_COMPILER" java          ;;
      OBJC) list_find "$GCC_COMPILER" objc          ;;
   FORTRAN) list_find "$GCC_COMPILER" fortran       ;;
        GO) list_find "$GCC_COMPILER" go            ;;
       ADA) list_find "$GCC_COMPILER" ada           ;;
- JAVAHOME) [[ $GCJ_HOME == "--enable-java-home" ]] ;;
         *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/gnu/gcc/SUB_DEPENDS b/gnu/gcc/SUB_DEPENDS
index da15eec288..845d003379 100755
--- a/gnu/gcc/SUB_DEPENDS
+++ b/gnu/gcc/SUB_DEPENDS
@@ -1,13 +1,10 @@
 persistent_add GCC_COMPILER        &&
-persistent_add GCJ_HOME            &&
 case $THIS_SUB_DEPENDS in
       CXX) true                           ;;
-     JAVA) list_add GCC_COMPILER java     ;;
      OBJC) list_add GCC_COMPILER objc     ;;
   FORTRAN) list_add GCC_COMPILER fortran  ;;
        GO) list_add GCC_COMPILER go       ;;
       ADA) list_add GCC_COMPILER ada      ;;
- JAVAHOME) GCJ_HOME="--enable-java-home"  ;;
         *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/gnu/gcc/UP_TRIGGERS b/gnu/gcc/UP_TRIGGERS
index af0684c90c..2babc48f5e 100755
--- a/gnu/gcc/UP_TRIGGERS
+++ b/gnu/gcc/UP_TRIGGERS
@@ -16,7 +16,7 @@ if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
   if   list_find "$GCC_COMPILER" c++ \
     && [[ ${OLD_SPELL_VERSION%%.*} != ${VERSION%%.*} ]]; then
 # gcc-5.x,y seems ok
-if [[ ${OLD_SPELL_VERSION%%.*} != "5" ]];then
+if [[ ${OLD_SPELL_VERSION%%.*} < "5" ]];then
     message "This is an ABI incompatible update of g++..."
     message "Determining which spells need to be recast, this may take a while."
 
diff --git a/gnu/gcc/python-gdb.patch b/gnu/gcc/python-gdb.patch
deleted file mode 100644
index b95d611e1e..0000000000
--- a/gnu/gcc/python-gdb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libstdc++-v3/python/Makefile.in.orig	2011-03-08 03:04:05.000000000 +0300
-+++ libstdc++-v3/python/Makefile.in	2011-09-10 18:09:36.692249020 +0400
-@@ -493,7 +493,7 @@
- 	    -e 's,@toolexeclibdir@,$(toolexeclibdir),' < $(srcdir)/hook.in > $@
- 
- install-data-local: gdb.py
--	@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
-+	@$(mkdir_p) $(DESTDIR)$(datadir)/gdb/auto-load
- 	@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- 	  for file in libstdc++*; do \
- 	    case $$file in \
-@@ -506,8 +506,8 @@
- 	    esac; \
- 	  done; \
- 	cd $$here; \
--	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
--	$(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
-+	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py"; \
-+	$(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.