| 1 |
dragonheart 08/04/02 07:41:43 |
| 2 |
|
| 3 |
Added: libdsk-1.2.1-java-make-fix.patch |
| 4 |
Log: |
| 5 |
version bump as suggested in bug #177273 and fixed a compile problem too. Thanks to Francisco for the bug report |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libdsk-1.2.1-java-make-fix.patch |
| 15 |
=================================================================== |
| 16 |
--- libdsk-1.2.1/lib/Makefile.am.orig 2008-04-02 13:27:24.000000000 +1100 |
| 17 |
+++ libdsk-1.2.1/lib/Makefile.am 2008-04-02 13:28:55.000000000 +1100 |
| 18 |
@@ -2,6 +2,7 @@ |
| 19 |
|
| 20 |
INCLUDES=-I$(top_srcdir)/include |
| 21 |
JAVAC=@JAVAC@ |
| 22 |
+JAVACFLAGS=@JAVACFLAGS@ |
| 23 |
JAVAH=@JAVAH@ |
| 24 |
JAVA=@JAVA@ |
| 25 |
JAVADOC=@JAVADOC@ |
| 26 |
@@ -85,10 +86,10 @@ |
| 27 |
$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE) |
| 28 |
|
| 29 |
$(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java |
| 30 |
- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< |
| 31 |
+ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< |
| 32 |
|
| 33 |
%.class: $(srcdir)/%.java |
| 34 |
- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< |
| 35 |
+ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< |
| 36 |
|
| 37 |
|
| 38 |
$(HEADERPRE)_%.h: $(CLASSDPRE)/%.class |
| 39 |
--- libdsk-1.2.1.orig/lib/Makefile.in 2008-01-24 06:29:49.000000000 +1100 |
| 40 |
+++ libdsk-1.2.1/lib/Makefile.in 2008-04-02 14:04:42.000000000 +1100 |
| 41 |
@@ -492,10 +492,10 @@ |
| 42 |
$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE) |
| 43 |
|
| 44 |
$(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java |
| 45 |
- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< |
| 46 |
+ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< |
| 47 |
|
| 48 |
%.class: $(srcdir)/%.java |
| 49 |
- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< |
| 50 |
+ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< |
| 51 |
|
| 52 |
$(HEADERPRE)_%.h: $(CLASSDPRE)/%.class |
| 53 |
$(JAVAH) -jni $(CLASSCPRE).`basename $< .class` |
| 54 |
--- libdsk-1.2.1.orig/tools/Makefile.am 2006-04-12 08:05:09.000000000 +1000 |
| 55 |
+++ libdsk-1.2.1/tools/Makefile.am 2008-04-02 14:06:06.000000000 +1100 |
| 56 |
@@ -32,5 +32,5 @@ |
| 57 |
CLEANFILES=*.class |
| 58 |
|
| 59 |
%.class: $(srcdir)/%.java |
| 60 |
- here=`pwd` && cd $(srcdir) && $(JAVAC) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $< |
| 61 |
+ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $< |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
-- |
| 67 |
gentoo-commits@l.g.o mailing list |
Archives