21 lines
907 B
Diff
21 lines
907 B
Diff
diff -up jna-3.4.0/native/Makefile~ jna-3.4.0/native/Makefile
|
|
--- jna-3.4.0/native/Makefile~ 2011-11-26 15:17:49.000000000 +0200
|
|
+++ jna-3.4.0/native/Makefile 2012-03-10 11:36:05.667190103 +0200
|
|
@@ -86,7 +86,7 @@ CDEFINES=-D_REENTRANT
|
|
PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
|
|
CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
|
|
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
|
|
-LDFLAGS=-o $@ -shared
|
|
+LDFLAGS=$(RPM_LD_FLAGS) -o $@ -shared
|
|
ifeq ($(DYNAMIC_LIBFFI),true)
|
|
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
|
|
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
|
|
@@ -276,7 +276,6 @@ $(RSRC): $(BUILD)/jnidispatch.rc
|
|
|
|
$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB)
|
|
$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
|
|
- $(STRIP) $@
|
|
|
|
$(TESTLIB): $(BUILD)/testlib.o
|
|
$(LD) $(LDFLAGS) $< $(LIBS)
|