diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2008-04-02 07:41:42 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2008-04-02 07:41:42 +0000 |
| commit | d89d0b4b3a5e4ebb9e9cb71f4682773b80ae5824 (patch) | |
| tree | 44c1e96e888693bcf0d1925b24efa79735a9501a /app-emulation/libdsk/files | |
| parent | stable x86/amd64 (diff) | |
| download | gentoo-2-d89d0b4b3a5e4ebb9e9cb71f4682773b80ae5824.tar.gz gentoo-2-d89d0b4b3a5e4ebb9e9cb71f4682773b80ae5824.tar.bz2 gentoo-2-d89d0b4b3a5e4ebb9e9cb71f4682773b80ae5824.zip | |
version bump as suggested in bug #177273 and fixed a compile problem too. Thanks to Francisco for the bug report
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-emulation/libdsk/files')
| -rw-r--r-- | app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch b/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch new file mode 100644 index 000000000000..07aa58c9a93e --- /dev/null +++ b/app-emulation/libdsk/files/libdsk-1.2.1-java-make-fix.patch @@ -0,0 +1,47 @@ +--- libdsk-1.2.1/lib/Makefile.am.orig 2008-04-02 13:27:24.000000000 +1100 ++++ libdsk-1.2.1/lib/Makefile.am 2008-04-02 13:28:55.000000000 +1100 +@@ -2,6 +2,7 @@ + + INCLUDES=-I$(top_srcdir)/include + JAVAC=@JAVAC@ ++JAVACFLAGS=@JAVACFLAGS@ + JAVAH=@JAVAH@ + JAVA=@JAVA@ + JAVADOC=@JAVADOC@ +@@ -85,10 +86,10 @@ + $(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE) + + $(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java +- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< ++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< + + %.class: $(srcdir)/%.java +- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< ++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< + + + $(HEADERPRE)_%.h: $(CLASSDPRE)/%.class +--- libdsk-1.2.1.orig/lib/Makefile.in 2008-01-24 06:29:49.000000000 +1100 ++++ libdsk-1.2.1/lib/Makefile.in 2008-04-02 14:04:42.000000000 +1100 +@@ -492,10 +492,10 @@ + $(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE) + + $(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java +- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< ++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< + + %.class: $(srcdir)/%.java +- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $< ++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $< + + $(HEADERPRE)_%.h: $(CLASSDPRE)/%.class + $(JAVAH) -jni $(CLASSCPRE).`basename $< .class` +--- libdsk-1.2.1.orig/tools/Makefile.am 2006-04-12 08:05:09.000000000 +1000 ++++ libdsk-1.2.1/tools/Makefile.am 2008-04-02 14:06:06.000000000 +1100 +@@ -32,5 +32,5 @@ + CLEANFILES=*.class + + %.class: $(srcdir)/%.java +- here=`pwd` && cd $(srcdir) && $(JAVAC) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $< ++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $< + |