Mercurial > hg > release > icedtea6-1.2
changeset 763:7a5a1bc07a33 cacao
2008-03-12 Matthias Klose <doko@ubuntu.com>
* patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk):
Find libgcj.so when the version of gcc != the version of gcj.
| author | doko@ubuntu.com |
|---|---|
| date | Wed, 12 Mar 2008 18:38:40 +0100 |
| parents | 1c434d050a0a |
| children | f13cc5d2c80c |
| files | ChangeLog patches/icedtea-ecj.patch |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 12 18:37:04 2008 +0100 +++ b/ChangeLog Wed Mar 12 18:38:40 2008 +0100 @@ -1,3 +1,8 @@ +2008-03-12 Matthias Klose <doko@ubuntu.com> + + * patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk): + Find libgcj.so when the version of gcc != the version of gcj. + 2008-03-12 Matthias Klose <doko@ubuntu.com> * configure.ac: Check for ffi.h/libffi.so without pkg-config.
--- a/patches/icedtea-ecj.patch Wed Mar 12 18:37:04 2008 +0100 +++ b/patches/icedtea-ecj.patch Wed Mar 12 18:38:40 2008 +0100 @@ -1019,7 +1019,7 @@ done) JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm -JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) -+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -lgcj $(JVMLIB) ++JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) # # We want to privatize JVM symbols on Solaris. This is so the user can