diff options
Diffstat (limited to 'dev-java/libmatthew-java')
| -rw-r--r-- | dev-java/libmatthew-java/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch | 49 | ||||
| -rw-r--r-- | dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild | 4 |
3 files changed, 53 insertions, 8 deletions
diff --git a/dev-java/libmatthew-java/ChangeLog b/dev-java/libmatthew-java/ChangeLog index 2cb1a82f26af..3742ad6bb4f4 100644 --- a/dev-java/libmatthew-java/ChangeLog +++ b/dev-java/libmatthew-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/libmatthew-java # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.2 2008/07/19 11:57:21 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.3 2008/07/19 13:08:26 serkan Exp $ + + 19 Jul 2008; Serkan Kaba <serkan@gentoo.org> + files/libmatthew-java-0.7.1-makefile-fixes.patch, + libmatthew-java-0.7.1.ebuild: + Fix compilation on x86-fbsd. Fix --as-needed. Patch provided by Alexis + Ballier <aballier@gentoo.org> 19 Jul 2008; Serkan Kaba <serkan@gentoo.org> libmatthew-java-0.7.1.ebuild: Fix src_unpack and recreate Manifest. Upstream changed and removed the diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch index a7494ebfea67..0901c40408a0 100644 --- a/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch +++ b/dev-java/libmatthew-java/files/libmatthew-java-0.7.1-makefile-fixes.patch @@ -1,7 +1,7 @@ diff -Nur libmatthew-java-0.7.1/Makefile libmatthew-java-0.7.1_patched/Makefile ---- libmatthew-java-0.7.1/Makefile 2008-04-26 15:35:13.000000000 +0300 -+++ libmatthew-java-0.7.1_patched/Makefile 2008-07-02 22:55:58.000000000 +0300 -@@ -6,7 +6,7 @@ +--- libmatthew-java-0.7.1/Makefile 2008-06-23 00:59:13.000000000 +0300 ++++ libmatthew-java-0.7.1_patched/Makefile 2008-07-19 16:02:43.000000000 +0300 +@@ -6,20 +6,19 @@ CC?=gcc LD?=ld PPFLAGS+=-C -P @@ -9,8 +9,24 @@ diff -Nur libmatthew-java-0.7.1/Makefile libmatthew-java-0.7.1_patched/Makefile +CFLAGS+=-fPIC -Wall -pedantic -std=c99 GCJFLAGS+=-fjni JCFLAGS+=-source 5.0 - INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -@@ -57,12 +57,7 @@ +-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux ++INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux + JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ + + LDVER?=$(shell ld -v | cut -d' ' -f1) + UNAME?=$(shell uname -s) + + ifeq ($(LDVER),GNU) +-LDFLAGS+=-fpic -shared -lc +-else +-LDFLAGS+=-lc ++LDFLAGS+=-fpic -shared + endif ++LDLIBS=-lc + + PREFIX?=/usr/local + JARDIR?=$(PREFIX)/share/java +@@ -57,12 +56,7 @@ io-$(IOVER).jar: .classes (cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class) unix-$(UNIXVER).jar: .classes @@ -24,3 +40,26 @@ diff -Nur libmatthew-java-0.7.1/Makefile libmatthew-java-0.7.1_patched/Makefile hexdump-$(HEXVER).jar: .classes (cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class) +@@ -70,7 +64,7 @@ + %.o: %.c %.h + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< + lib%.so: %.o +- $(LD) $(LDFLAGS) -o $@ $< ++ $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS) + unix-java.h: .classes + $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream + cgi-java.h: .classes +@@ -85,11 +79,11 @@ + tar zcf $@ libmatthew-java-$(MATTVER) + + debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp +- make .enabledebug ++ $(MAKE) .enabledebug + echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest + (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) + debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp +- make .disabledebug ++ $(MAKE) .disabledebug + echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest + (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) + .enabledebug: cx/ath/matthew/debug/Debug.jpp diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild index d68b5c45a0a3..9df7ce9a4cd4 100644 --- a/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild +++ b/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild,v 1.2 2008/07/19 11:57:21 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.1.ebuild,v 1.3 2008/07/19 13:08:26 serkan Exp $ JAVA_PKG_IUSE="doc source" inherit eutils java-pkg-2 flag-o-matic toolchain-funcs @@ -25,7 +25,7 @@ src_unpack() { src_compile() { LDFLAGS="$(raw-ldflags)" \ - CC=$(tc-getCC) LD=$(tc-getLD) \ + CC=$(tc-getCC) LD=$(tc-getLD) INCLUDES="$(java-pkg_get-jni-cflags)" \ emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed" } |