Update to the 20130526 snapshot of GCC 4.9.0. (This requires a small

adjustment to our Java hierarchy patch, no functional change though.)
This commit is contained in:
Gerald Pfeifer 2013-05-31 22:52:02 +00:00
parent 039aba32a6
commit f5322ed876
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=319548
3 changed files with 11 additions and 13 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
PORTVERSION= 4.9.0.20130505
PORTVERSION= 4.9.0.20130526
CATEGORIES= lang java
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}

View file

@ -1,2 +1,2 @@
SHA256 (gcc-4.9-20130505.tar.bz2) = 7a2a06a441ebd1f13a0f4226dca46bd445d63c80293a11ad224afb2f13c17314
SIZE (gcc-4.9-20130505.tar.bz2) = 82930396
SHA256 (gcc-4.9-20130526.tar.bz2) = 09c477a35d009de22c8dde0ec37e967562a69d9a4f8a2e3e4744a353f35a6b55
SIZE (gcc-4.9-20130526.tar.bz2) = 82889867

View file

@ -1,13 +1,11 @@
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
--- 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)