1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
Description: Fixes the build failure with Java 10
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/lib/alsa/Makefile.in
+++ b/src/lib/alsa/Makefile.in
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -130,7 +130,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@
JL_SRC = @JL_DIR@
%.class: %.java
- $(JAVAC) -classpath $(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH -d $(DESTDIR) $<
+ $(JAVAC) -h . -classpath $(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH -d $(DESTDIR) $<
@#export CLASSPATH=$(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH; $(JAVAC) -d $(DESTDIR) $<
--- a/build.xml
+++ b/build.xml
@@ -14,9 +14,11 @@
<target name="compile" depends="prepare">
+ <mkdir dir="jni"/>
<javac srcdir="${src}"
debug="${debug}"
source="${source}"
+ nativeHeaderDir="jni"
destdir="${build}"
sourcepath="${src.classes}">
<compilerarg compiler="kjc" value="-generic"/>
@@ -33,6 +35,7 @@
<javac srcdir="${src.classes}"
debug="${debug}"
source="${source}"
+ nativeHeaderDir="jni"
destdir="${build}" >
<compilerarg compiler="kjc" value="-generic"/>
<compilerarg value="-Xlint:unchecked"/>
--- a/src/lib/cdparanoia/Makefile.in
+++ b/src/lib/cdparanoia/Makefile.in
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -64,7 +64,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
--- a/src/lib/cooked_ioctl/Makefile.in
+++ b/src/lib/cooked_ioctl/Makefile.in
@@ -11,7 +11,7 @@
ARCHNAME=@ARCHNAME@
CC=@CC@
CXX=@CC@ -x c
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -62,7 +62,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
--- a/src/lib/fluidsynth/Makefile.in
+++ b/src/lib/fluidsynth/Makefile.in
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -81,7 +81,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
--- a/src/lib/pvorbis/Makefile.in
+++ b/src/lib/pvorbis/Makefile.in
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -I. -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I. -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -101,7 +101,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
--- a/src/lib/vorbis/Makefile.in
+++ b/src/lib/vorbis/Makefile.in
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -87,7 +87,6 @@
$(JNIHEADERS): $(JNICLASSFILES)
$(RM_F) $(JNIHEADERS)
- $(JAVAH) -d . $(JNICLASSES)
.PHONY: install
install:
|
