dev-java/jffi: remove unused patches

7 files changed, 0 insertions, 229 deletions

diff --git a/dev-java/jffi/files/1.0.0-gcc-3.4.patch b/dev-java/jffi/files/1.0.0-gcc-3.4.patch
deleted file mode 100644
index fc2bd5cae10a..000000000000
--- a/dev-java/jffi/files/1.0.0-gcc-3.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index 7a027af..eaba319 100755
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -188,9 +188,6 @@ endif
- 
- ifeq ($(CPU), i386)
-   MODEL = 32
--  ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),)
--    CFLAGS += -march=i586 -mtune=generic
--  endif
- endif
- 
- ifeq ($(CPU), amd64)
diff --git a/dev-java/jffi/files/jffi-1.0.0-makefile.patch b/dev-java/jffi/files/jffi-1.0.0-makefile.patch
deleted file mode 100644
index 11ca2ed68530..000000000000
--- a/dev-java/jffi/files/jffi-1.0.0-makefile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- jni/GNUmakefile	2010-03-12 12:06:39.000000000 +1300
-+++ jni/GNUmakefile	2010-03-12 12:13:44.000000000 +1300
-@@ -65,7 +65,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -78,9 +78,9 @@
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
--CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
-+CXXFLAGS += $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
- 
- ifeq ($(OS), win64)
-   override CPU = x86_64
-@@ -258,58 +258,6 @@
- 	@mkdir -p $(@D)
- 	$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
- 
--
--ifeq ($(OS), darwin)
--build_ffi = \
--	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
--	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
--	    echo "Configuring libffi for $(1)"; \
--	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
--	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
--		$(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
--	fi); \
--	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
--	
--$(LIBFFI):
--	@mkdir -p $(@D)
--	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
--	
--	# Assemble into a FAT (i386, x86_64, ppc) library
--	@mkdir -p $(BUILD_DIR)/libffi/.libs
--	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
--	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
--	@mkdir -p $(LIBFFI_BUILD_DIR)/include
--	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
--else
--$(LIBFFI):		
--	@mkdir -p $(LIBFFI_BUILD_DIR)
--	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
--	    echo "Configuring libffi for $(PLATFORM)"; \
--	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
--		$(LIBFFI_CONFIGURE) > /dev/null; \
--	fi
--	$(MAKE) -C $(LIBFFI_BUILD_DIR)
--endif
--
--
- clean::
- 	# nothing to do - ant will delete the build dir
- 
diff --git a/dev-java/jffi/files/jffi-1.2.5_no-werror.patch b/dev-java/jffi/files/jffi-1.2.5_no-werror.patch
deleted file mode 100644
index 25b7e4f8ec00..000000000000
--- a/dev-java/jffi/files/jffi-1.2.5_no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index efe6230..25053c7 100755
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
-   WFLAGS += -Wundef $(WERROR)
- endif
diff --git a/dev-java/jffi/files/jffi-1.2.6_no-werror.patch b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
deleted file mode 100644
index 25b7e4f8ec00..000000000000
--- a/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index efe6230..25053c7 100755
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
-   WFLAGS += -Wundef $(WERROR)
- endif
diff --git a/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch
deleted file mode 100644
index ac3843a0053a..000000000000
--- a/dev-java/jffi/files/jffi-1.2.7-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.7-makefile.patch b/dev-java/jffi/files/jffi-1.2.7-makefile.patch
deleted file mode 100644
index ed17f7882ce5..000000000000
--- a/dev-java/jffi/files/jffi-1.2.7-makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
-index 27737be..2e709d9 100755
---- a/jffi-1.2.7/jni/GNUmakefile
-+++ b/jffi-1.2.7/jni/GNUmakefile
-@@ -47,7 +47,6 @@ else
-   LIBFFI_SRC_DIR = $(SRC_DIR)/libffi
-   LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(PLATFORM)
-   LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.a
--  LIBFFI_LIBS = $(LIBFFI)
-   LIBFFI_CFLAGS = -I"$(LIBFFI_BUILD_DIR)"/include
- endif
- 
-@@ -64,11 +63,11 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
-   WFLAGS += -Wundef $(WERROR)
- endif
--WFLAGS += -W -Wall -Wno-unused -Wno-parentheses
-+WFLAGS += -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
- FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
-@@ -279,7 +278,7 @@ debug:
- 	@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
- 	@echo "OBJS=$(OBJS)"
- 
--$(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
-+$(LIBJFFI):  $(OBJS)
- 	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
- 	$(STRIP) $@
- 
-@@ -291,7 +290,7 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
- 	@mkdir -p $(@D)
- 	@$(CC) $(CFLAGS) -o $@ -c $<
- 
--$(OBJS) : $(LIBFFI_LIBS)
-+$(OBJS) : 
- 
- ifeq ($(OS), darwin)
- build_ffi = \
-diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
-index 9e70664..3e279a3 100644
---- a/jffi-1.2.7/libtest/GNUmakefile
-+++ b/jffi-1.2.7/libtest/GNUmakefile
-@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
- # 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-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
- PICFLAGS = -fPIC
--SOFLAGS = -shared -Wl,-O1
-+SOFLAGS = -shared
- LDFLAGS += $(SOFLAGS)
- 
- IFLAGS = -I"$(BUILD_DIR)"
diff --git a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
deleted file mode 100644
index 517a1e546d8b..000000000000
--- a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
-index 27737be..98f147e 100755
---- a/jffi-1.2.7/jni/GNUmakefile
-+++ b/jffi-1.2.7/jni/GNUmakefile
-@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
-   WFLAGS += -Wundef $(WERROR)
- endif
-diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
-index 9e70664..72e4cc9 100644
---- a/jffi-1.2.7/libtest/GNUmakefile
-+++ b/jffi-1.2.7/libtest/GNUmakefile
-@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
- # 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-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
- PICFLAGS = -fPIC
--SOFLAGS = -shared -Wl,-O1
-+SOFLAGS = -shared
- LDFLAGS += $(SOFLAGS)
- 
- IFLAGS = -I"$(BUILD_DIR)"