2017-07-10 09:45:33 +00:00
|
|
|
From c72c148b343d0071cb89bb71caa56ce8c73cdd8f Mon Sep 17 00:00:00 2001
|
2017-01-16 15:01:47 +00:00
|
|
|
From: Michael Simacek <msimacek@redhat.com>
|
|
|
|
|
Date: Mon, 16 Jan 2017 11:29:06 +0100
|
2017-07-10 09:45:33 +00:00
|
|
|
Subject: [PATCH 1/5] Adapt build
|
2017-01-16 15:01:47 +00:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
native/Makefile | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/native/Makefile b/native/Makefile
|
2017-07-10 09:45:33 +00:00
|
|
|
index a465660..1325d8c 100644
|
2017-01-16 15:01:47 +00:00
|
|
|
--- a/native/Makefile
|
|
|
|
|
+++ b/native/Makefile
|
|
|
|
|
@@ -107,7 +107,7 @@ CDEFINES=-D_REENTRANT
|
2012-10-26 11:31:17 +00:00
|
|
|
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)
|
2017-07-10 09:45:33 +00:00
|
|
|
@@ -432,7 +432,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp:
|
2012-10-26 11:31:17 +00:00
|
|
|
|
|
|
|
|
$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB)
|
|
|
|
|
$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
|
|
|
|
|
- $(STRIP) $@
|
|
|
|
|
|
|
|
|
|
$(TESTLIB): $(BUILD)/testlib.o
|
|
|
|
|
$(LD) $(LDFLAGS) $< $(LIBS)
|
2017-01-16 15:01:47 +00:00
|
|
|
--
|
|
|
|
|
2.9.3
|
|
|
|
|
|
