* [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch
@ 2010-02-28 10:14 Serkan Kaba (serkan)
0 siblings, 0 replies; 3+ messages in thread
From: Serkan Kaba (serkan) @ 2010-02-28 10:14 UTC (permalink / raw
To: gentoo-commits
serkan 10/02/28 10:14:19
Added: libmatthew-java-0.7.2-makefile-fixes.patch
Log:
Version bump.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
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
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
Index: libmatthew-java-0.7.2-makefile-fixes.patch
===================================================================
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200
@@ -6,13 +6,13 @@
CC?=gcc
LD?=gcc
JPPFLAGS+=-C -P
-CFLAGS+=-Wall -Os -pedantic -Werror
+CFLAGS+=-Wall -pedantic -Werror
CSTD?=-std=c99
CSHAREFLAG+=-fpic -fno-stack-protector
GCJJNIFLAG=-fjni
JVERCFLAGS+=-source 1.5
JCFLAGS+=
-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)
@@ -20,9 +20,8 @@
ifeq ($(LDVER),GNU)
LDSHAREFLAGS+=-fpic -shared
-else
-LDSHAREFLAGS+=-lc
endif
+LDLIBS=-lc
PREFIX?=/usr/local
JARDIR?=$(PREFIX)/share/java
@@ -62,12 +61,7 @@
io-$(IOVER).jar: .classes
(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
unix-$(UNIXVER).jar: .classes
-ifeq ($(DEBUG),enable)
- echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
-else
- echo "Class-Path: " > Manifest
-endif
- (cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
+ (cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class)
hexdump-$(HEXVER).jar: .classes
(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
@@ -75,7 +69,7 @@
%.o: %.c %.h
$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
lib%.so: %.o
- $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
+ $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -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
@@ -91,12 +85,10 @@
debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
make .enabledebug
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
make .disabledebug
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
.enabledebug: cx/ath/matthew/debug/Debug.jpp
mkdir -p classes
cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch
@ 2010-08-30 16:17 Serkan Kaba (serkan)
0 siblings, 0 replies; 3+ messages in thread
From: Serkan Kaba (serkan) @ 2010-08-30 16:17 UTC (permalink / raw
To: gentoo-commits
serkan 10/08/30 16:17:37
Modified: libmatthew-java-0.7.2-makefile-fixes.patch
Log:
Revbump to respect LDFLAGS. Thanks to Diego E. Pettenò <flameeyes@gentoo.org> for the help.
Drop -Werror from the Makefile.
(Portage version: 2.2_rc70/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?r1=1.1&r2=1.2
Index: libmatthew-java-0.7.2-makefile-fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmatthew-java-0.7.2-makefile-fixes.patch 28 Feb 2010 10:14:18 -0000 1.1
+++ libmatthew-java-0.7.2-makefile-fixes.patch 30 Aug 2010 16:17:37 -0000 1.2
@@ -6,7 +6,7 @@
LD?=gcc
JPPFLAGS+=-C -P
-CFLAGS+=-Wall -Os -pedantic -Werror
-+CFLAGS+=-Wall -pedantic -Werror
++CFLAGS+=-Wall -pedantic
CSTD?=-std=c99
CSHAREFLAG+=-fpic -fno-stack-protector
GCJJNIFLAG=-fjni
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch
@ 2012-05-29 10:06 Naohiro Aota (naota)
0 siblings, 0 replies; 3+ messages in thread
From: Naohiro Aota (naota) @ 2012-05-29 10:06 UTC (permalink / raw
To: gentoo-commits
naota 12/05/29 10:06:52
Modified: libmatthew-java-0.7.2-makefile-fixes.patch
Log:
Add ~x86-fbsd. #406009
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?r1=1.2&r2=1.3
Index: libmatthew-java-0.7.2-makefile-fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmatthew-java-0.7.2-makefile-fixes.patch 30 Aug 2010 16:17:37 -0000 1.2
+++ libmatthew-java-0.7.2-makefile-fixes.patch 29 May 2012 10:06:52 -0000 1.3
@@ -1,7 +1,7 @@
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200
-@@ -6,13 +6,13 @@
+@@ -6,13 +6,12 @@
CC?=gcc
LD?=gcc
JPPFLAGS+=-C -P
@@ -13,7 +13,6 @@
JVERCFLAGS+=-source 1.5
JCFLAGS+=
-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)
@@ -51,17 +50,20 @@
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
-@@ -91,12 +85,10 @@
+@@ -91,13 +85,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)
++ $(MAKE) .enabledebug
+ (cd classes;jar cf ../$@ 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)
++ $(MAKE) .disabledebug
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
.enabledebug: cx/ath/matthew/debug/Debug.jpp
mkdir -p classes
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-29 10:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-29 10:06 [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch Naohiro Aota (naota)
-- strict thread matches above, loose matches on Subject: below --
2010-08-30 16:17 Serkan Kaba (serkan)
2010-02-28 10:14 Serkan Kaba (serkan)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox