| 1 |
serkan 10/02/28 10:14:19 |
| 2 |
|
| 3 |
Added: libmatthew-java-0.7.2-makefile-fixes.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libmatthew-java-0.7.2-makefile-fixes.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile |
| 17 |
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300 |
| 18 |
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200 |
| 19 |
@@ -6,13 +6,13 @@ |
| 20 |
CC?=gcc |
| 21 |
LD?=gcc |
| 22 |
JPPFLAGS+=-C -P |
| 23 |
-CFLAGS+=-Wall -Os -pedantic -Werror |
| 24 |
+CFLAGS+=-Wall -pedantic -Werror |
| 25 |
CSTD?=-std=c99 |
| 26 |
CSHAREFLAG+=-fpic -fno-stack-protector |
| 27 |
GCJJNIFLAG=-fjni |
| 28 |
JVERCFLAGS+=-source 1.5 |
| 29 |
JCFLAGS+= |
| 30 |
-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux |
| 31 |
+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux |
| 32 |
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ |
| 33 |
|
| 34 |
LDVER?=$(shell ld -v | cut -d' ' -f1) |
| 35 |
@@ -20,9 +20,8 @@ |
| 36 |
|
| 37 |
ifeq ($(LDVER),GNU) |
| 38 |
LDSHAREFLAGS+=-fpic -shared |
| 39 |
-else |
| 40 |
-LDSHAREFLAGS+=-lc |
| 41 |
endif |
| 42 |
+LDLIBS=-lc |
| 43 |
|
| 44 |
PREFIX?=/usr/local |
| 45 |
JARDIR?=$(PREFIX)/share/java |
| 46 |
@@ -62,12 +61,7 @@ |
| 47 |
io-$(IOVER).jar: .classes |
| 48 |
(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class) |
| 49 |
unix-$(UNIXVER).jar: .classes |
| 50 |
-ifeq ($(DEBUG),enable) |
| 51 |
- echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest |
| 52 |
-else |
| 53 |
- echo "Class-Path: " > Manifest |
| 54 |
-endif |
| 55 |
- (cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class) |
| 56 |
+ (cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class) |
| 57 |
|
| 58 |
hexdump-$(HEXVER).jar: .classes |
| 59 |
(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class) |
| 60 |
@@ -75,7 +69,7 @@ |
| 61 |
%.o: %.c %.h |
| 62 |
$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $< |
| 63 |
lib%.so: %.o |
| 64 |
- $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< |
| 65 |
+ $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< $(LDLIBS) |
| 66 |
unix-java.h: .classes |
| 67 |
$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream |
| 68 |
cgi-java.h: .classes |
| 69 |
@@ -91,12 +85,10 @@ |
| 70 |
|
| 71 |
debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
| 72 |
make .enabledebug |
| 73 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
| 74 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
| 75 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
| 76 |
debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
| 77 |
make .disabledebug |
| 78 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
| 79 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
| 80 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
| 81 |
.enabledebug: cx/ath/matthew/debug/Debug.jpp |
| 82 |
mkdir -p classes |
| 83 |
cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java |
Archives