diff options
author | 2022-09-05 06:59:56 +0200 | |
---|---|---|
committer | 2022-09-05 10:00:30 +0200 | |
commit | 1dadcd01829b64f07b6edbb4a1c38cba700f482f (patch) | |
tree | 75c3d6f0dd8c91a557f3dd51dec39b9e2d8a6214 /dev-java/jffi/files | |
parent | dev-java/jython: drop 2.7.0-r6 (diff) | |
download | gentoo-1dadcd01829b64f07b6edbb4a1c38cba700f482f.tar.gz gentoo-1dadcd01829b64f07b6edbb4a1c38cba700f482f.tar.bz2 gentoo-1dadcd01829b64f07b6edbb4a1c38cba700f482f.zip |
dev-java/jffi: drop 1.2.9-r1, 1.3.6
Closes: https://bugs.gentoo.org/736838
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27148
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-java/jffi/files')
-rw-r--r-- | dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch | 14 | ||||
-rw-r--r-- | dev-java/jffi/files/jffi-1.2.8-makefile.patch | 52 | ||||
-rw-r--r-- | dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 |
3 files changed, 0 insertions, 92 deletions
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch deleted file mode 100644 index ac3843a0053a..000000000000 --- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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() { diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch deleted file mode 100644 index cdc28a662b51..000000000000 --- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/jni/GNUmakefile -+++ b/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 = \ ---- a/libtest/GNUmakefile -+++ b/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) diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch deleted file mode 100644 index 2dd5e9d8791a..000000000000 --- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/jni/GNUmakefile b/jni/GNUmakefile -index c0f298c..457626f 100755 ---- a/jni/GNUmakefile -+++ b/jni/GNUmakefile -@@ -278,16 +278,16 @@ debug: - @echo "OBJS=$(OBJS)" - - $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) -- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) -+ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS) - $(STRIP) $@ - - $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h) -- @mkdir -p $(@D) -- @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ -+ mkdir -p $(@D) -+ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ - - $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h) -- @mkdir -p $(@D) -- @$(CC) $(CFLAGS) -o $@ -c $< -+ mkdir -p $(@D) -+ $(CC) $(CFLAGS) -o $@ -c $< - - $(OBJS) : $(LIBFFI) - |