summaryrefslogtreecommitdiff
path: root/lang/gcc/files/java-patch-hier
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2016-11-20 09:15:19 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2016-11-20 09:15:19 +0000
commit64bbcf8b752771c4cfd64dfa9cfd5d59bbd977b4 (patch)
treedd835cb195359d059a3ab106da0ccac9bfc0c71f /lang/gcc/files/java-patch-hier
parent- Switch to options helpers (diff)
Long awaited, finally update the default version of GCC in the Ports
Collection as well as the lang/gcc port from GCC 4.8.5 to GCC 4.9.4! See http://gcc.gnu.org/gcc-4.9/changes.html for an extensive list of changes and http://gcc.gnu.org/gcc-4.9/porting_to.html for information on how to port to that new version (if necessary). files/java-patch-hier required adjustments, gcc/files/patch-arm-libcpp is not needed any longer (merged upstream), and we're also loosing the local Stack Protector patches/backports. PR: 196712 Tested by: antoine (-exp runs) Supported by: antoine, kwm, and others
Notes
Notes: svn path=/head/; revision=426565
Diffstat (limited to 'lang/gcc/files/java-patch-hier')
-rw-r--r--lang/gcc/files/java-patch-hier19
1 files changed, 9 insertions, 10 deletions
diff --git a/lang/gcc/files/java-patch-hier b/lang/gcc/files/java-patch-hier
index edb122b087b8..e34a86988e56 100644
--- a/lang/gcc/files/java-patch-hier
+++ b/lang/gcc/files/java-patch-hier
@@ -1,13 +1,12 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in (revision 117734)
-+++ libjava/Makefile.in (working copy)
-@@ -712,7 +712,7 @@
- $(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- UTC
+--- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
++++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
+@@ -941,7 +941,7 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfigdir = $(toolexeclibdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ $(am__append_5)