diff options
| author | joerg <joerg@pkgsrc.org> | 2006-05-29 17:47:10 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-05-29 17:47:10 +0000 |
| commit | 0461ff04d40fdd0bdd760855a20370a03d089b5d (patch) | |
| tree | f6ea571eaccbb01860f2dfd4b84a2684f5c8f347 | |
| parent | 0ad527e2a3503e2d7a5e1dc9f710793e5e8a0fb3 (diff) | |
| download | pkgsrc-0461ff04d40fdd0bdd760855a20370a03d089b5d.tar.gz | |
Use the installed version of libkaffevm and be a bit less aggressive
in kaffe-x11 when not building parts of the tree. Fixes build issues
on DragonFly, but doesn't affect the binary package.
| -rw-r--r-- | lang/kaffe-x11/Makefile | 16 | ||||
| -rw-r--r-- | lang/kaffe/distinfo | 3 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-ad | 22 |
3 files changed, 32 insertions, 9 deletions
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile index be4da91f1a0..83f2f96a337 100644 --- a/lang/kaffe-x11/Makefile +++ b/lang/kaffe-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/05/10 16:46:21 tonio Exp $ +# $NetBSD: Makefile,v 1.11 2006/05/29 17:47:10 joerg Exp $ # .include "../../lang/kaffe/Makefile.common" @@ -14,13 +14,13 @@ CONFIGURE_ARGS+= --without-esd CONFIGURE_ARGS+= --disable-esdtest -BUILD_DIRS= config -BUILD_DIRS+= libraries/javalib -BUILD_DIRS+= libraries/clib/classpath -BUILD_DIRS+= libraries/clib/awt -BUILD_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer -BUILD_DIRS+= libraries/javalib/external/classpath/native/jawt -INSTALL_DIRS= libraries/clib/awt +BUILD_DIRS= config +BUILD_DIRS+= libraries/javalib/external/classpath +BUILD_DIRS+= libraries/javalib/external/classpath +BUILD_DIRS+= include +BUILD_DIRS+= libraries/javalib +BUILD_DIRS+= libraries/clib/awt +INSTALL_DIRS= libraries/clib/awt INSTALL_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer INSTALL_DIRS+= libraries/javalib/external/classpath/native/jawt diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index c9d6197be9b..38b3975186b 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2006/05/16 19:11:33 joerg Exp $ +$NetBSD: distinfo,v 1.23 2006/05/29 17:47:10 joerg Exp $ SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b @@ -6,3 +6,4 @@ Size (kaffe-1.1.7.tar.gz) = 14494274 bytes SHA1 (patch-aa) = a06b60e1ba76df59955bd1aba305fc8fef0a310a SHA1 (patch-ab) = 51382ff9c9672eab7bb1729e8435af3d134a4ea1 SHA1 (patch-ac) = 2fb9d3d7bdfdecd6090403aae9485662d1bcfbc5 +SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad new file mode 100644 index 00000000000..c40fc7d7b80 --- /dev/null +++ b/lang/kaffe/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.10 2006/05/29 17:47:10 joerg Exp $ + +--- libraries/clib/awt/X/Makefile.in.orig 2006-05-29 15:57:43.000000000 +0000 ++++ libraries/clib/awt/X/Makefile.in +@@ -84,7 +84,7 @@ am__installdirs = "$(DESTDIR)$(nativedir + nativeLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(native_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libxawt_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \ ++libxawt_la_DEPENDENCIES = \ + $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \ + $(am__DEPENDENCIES_1) + am_libxawt_la_OBJECTS = libxawt_la-tlk.lo libxawt_la-wnd.lo \ +@@ -399,7 +399,7 @@ libxawt_la_LDFLAGS = \ + -export-symbols-regex "^([Jj]ava|kaffe)_" + + libxawt_la_LIBADD = \ +- $(top_builddir)/kaffe/kaffevm/libkaffevm.la \ ++ ${nativedir}/libkaffevm.la \ + $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \ + $(AWT_LIBS) + |