monsieurp 15/03/21 18:29:53
Added: jffi-1.2.8-junit-4.11.patch
jffi-1.2.8-makefile.patch
Log:
Version bump courtesy of Arfrever <[email protected]>.
Signed-off-by: [email protected]
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
93491BB8)
Revision Changes Path
1.1 dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch?rev=1.1&content-type=text/plain
Index: jffi-1.2.8-junit-4.11.patch
===================================================================
--- a/src/test/java/com/kenai/jffi/NumberTest.java
+++ b/src/test/java/com/kenai/jffi/NumberTest.java
@@ -234,9 +234,8 @@
private void returnF32(InvokerType type) {
LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class,
type);
float[] values = { 0f, 1.0f, -2.0f };
- for (int i = 0; i < values.length; ++i) {
- assertEquals("Value not returned correctly", values[i],
lib.ret_float(values[i]), 0.1f);
- }
+ float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f),
lib.ret_float(-2.0f) };
+ assertArrayEquals("Value not returned correctly", values, lib_values,
0.1f);
}
@Test public void returnDefaultF64() {
1.1 dev-java/jffi/files/jffi-1.2.8-makefile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.2.8-makefile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.2.8-makefile.patch?rev=1.1&content-type=text/plain
Index: jffi-1.2.8-makefile.patch
===================================================================
--- jni/GNUmakefile
+++ jni/GNUmakefile
@@ -41,6 +41,7 @@
JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
ifeq ($(USE_SYSTEM_LIBFFI),1)
+ LIBFFI =
LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
else
@@ -64,9 +65,8 @@
OFLAGS = -O2 $(JFLAGS)
# MacOS headers aren't completely warning free, so turn them off
-WERROR = -Werror
ifneq ($(OS),darwin)
- WFLAGS += -Wundef $(WERROR)
+ WFLAGS += -Wundef
endif
WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
PICFLAGS = -fPIC
@@ -279,7 +279,7 @@
@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
@echo "OBJS=$(OBJS)"
-$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
+$(LIBJFFI): $(OBJS) $(LIBFFI)
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
$(STRIP) $@
@@ -291,7 +291,7 @@
@mkdir -p $(@D)
@$(CC) $(CFLAGS) -o $@ -c $<
-$(OBJS) : $(LIBFFI_LIBS)
+$(OBJS) : $(LIBFFI)
ifeq ($(OS), darwin)
build_ffi = \
--- libtest/GNUmakefile
+++ libtest/GNUmakefile
@@ -44,8 +44,8 @@
# Compiler/linker flags from:
#
http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
-OFLAGS = -O2 $(JFLAGS)
-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+OFLAGS = $(JFLAGS)
+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
PICFLAGS = -fPIC
SOFLAGS = -shared -Wl,-O1
LDFLAGS += $(SOFLAGS)
