Gentoo Archives: gentoo-commits

From: "Naohiro Aota (naota)" <naota@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch
Date: Tue, 29 May 2012 10:07:07
Message-Id: 20120529100652.F09872004B@flycatcher.gentoo.org
1 naota 12/05/29 10:06:52
2
3 Modified: libmatthew-java-0.7.2-makefile-fixes.patch
4 Log:
5 Add ~x86-fbsd. #406009
6
7 (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
11
12 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
13 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
14 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
15
16 Index: libmatthew-java-0.7.2-makefile-fixes.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- libmatthew-java-0.7.2-makefile-fixes.patch 30 Aug 2010 16:17:37 -0000 1.2
23 +++ libmatthew-java-0.7.2-makefile-fixes.patch 29 May 2012 10:06:52 -0000 1.3
24 @@ -1,7 +1,7 @@
25 diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
26 --- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300
27 +++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200
28 -@@ -6,13 +6,13 @@
29 +@@ -6,13 +6,12 @@
30 CC?=gcc
31 LD?=gcc
32 JPPFLAGS+=-C -P
33 @@ -13,7 +13,6 @@
34 JVERCFLAGS+=-source 1.5
35 JCFLAGS+=
36 -INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
37 -+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
38 JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
39
40 LDVER?=$(shell ld -v | cut -d' ' -f1)
41 @@ -51,17 +50,20 @@
42 unix-java.h: .classes
43 $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
44 cgi-java.h: .classes
45 -@@ -91,12 +85,10 @@
46 +@@ -91,13 +85,11 @@
47 + tar zcf $@ libmatthew-java-$(MATTVER)
48
49 debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
50 - make .enabledebug
51 +- make .enabledebug
52 - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
53 - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
54 ++ $(MAKE) .enabledebug
55 + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
56 debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
57 - make .disabledebug
58 +- make .disabledebug
59 - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
60 - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
61 ++ $(MAKE) .disabledebug
62 + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
63 .enabledebug: cx/ath/matthew/debug/Debug.jpp
64 mkdir -p classes