Package: libreadline-java / 0.8.0.1+dfsg-9

native-makefile.patch Patch series | download
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
Description: Fix the native Makefile to use correct java and read LDFLAGS.

--- libreadline-java-0.8.0.1.orig/src/native/Makefile
+++ libreadline-java-0.8.0.1/src/native/Makefile
@@ -44,7 +44,7 @@ LIB_PRE :=
 LIB_EXT := dll
 CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
 else
-INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
+INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVAINCLUDE)/linux -I $(JAVANATINC) -I $(JAVANATINC)/linux
 LIBPATH           = -L/usr/lib/termcap 
 JavaReadline_LIBS = -lreadline -ltermcap -lhistory
 JavaEditline_LIBS = -ledit -ltermcap
@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
 		$(OBJECTS) -W1,-e,_readline_init@12
 else
-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+	$(CC) $(LDFLAGS) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
 endif
 endif
 
@@ -110,7 +110,6 @@
 	                                   -c org_gnu_readline_Readline.c
 
 org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
-	javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
 	touch org_gnu_readline_Readline.h
 
 clean: