diff options
| author | gerald <gerald@FreeBSD.org> | 2006-10-20 00:43:58 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2006-10-20 00:43:58 +0800 |
| commit | aad0a7689742fb35690c0ffffa6444ebab06ce85 (patch) | |
| tree | a93f179696176a7995c6b13d1fba72cd547be87e /lang/gcc46/files | |
| parent | 3783a722bf2dd4fc1683f237e2cd7bd9fe7763f3 (diff) | |
| download | freebsd-ports-gnome-aad0a7689742fb35690c0ffffa6444ebab06ce85.tar.gz freebsd-ports-gnome-aad0a7689742fb35690c0ffffa6444ebab06ce85.tar.zst freebsd-ports-gnome-aad0a7689742fb35690c0ffffa6444ebab06ce85.zip | |
Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a
version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64
on the way (enabling Java actually was a noop, except for pkg-plist).
Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2.
These changes allow us to remove the CONFLICT between lang/gcc41 and
lang/gcc42 when building with Java support (the default on i386).
Approved by: portmgr (erwin)
Diffstat (limited to 'lang/gcc46/files')
| -rw-r--r-- | lang/gcc46/files/java-patch-hier | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc46/files/java-patch-hier +++ b/lang/gcc46/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) |