Add a snapshot from upstream, this time the path to the library is injected at build-time so that it does not have to be defined at runtime.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

1 files changed, 154 insertions, 0 deletions

diff --git a/dev-java/jffi/files/jffi-0.7-makefile-flags.patch b/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
new file mode 100644
index 000000000000..394d65b44b5b
--- /dev/null
+++ b/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
@@ -0,0 +1,154 @@
+Index: wmeissner-jffi-6c5fb4a/jni/GNUmakefile
+===================================================================
+--- wmeissner-jffi-6c5fb4a.orig/jni/GNUmakefile
++++ wmeissner-jffi-6c5fb4a/jni/GNUmakefile
+@@ -58,7 +58,7 @@ OFLAGS = -O2 $(JFLAGS)
+ 
+ # 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
+@@ -70,8 +70,8 @@ FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
+ STRIP = strip -S
+ 
+ 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)" -I"$(LIBFFI_BUILD_DIR)"/include
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
++IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+ CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
+ 
+@@ -204,15 +204,15 @@ ifneq ($(strip $(findstring $(OS), linux
+ endif
+ 
+ LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
+-FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
+-	--with-pic=yes --disable-dependency-tracking
+-ifdef CONFIGURE_HOST
+-	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
+-endif
+-
+-ifdef CONFIGURE_BUILD
+-	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
+-endif
++#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
++#	--with-pic=yes --disable-dependency-tracking
++#ifdef CONFIGURE_HOST
++#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
++#endif
++#
++#ifdef CONFIGURE_BUILD
++#	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
++#endif
+ 
+ all:	$(LIBJFFI)
+ 
+@@ -245,55 +245,55 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.cpp $(wi
+ 	$(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)" \
+-		$(FFI_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)" \
+-		$(FFI_CONFIGURE) > /dev/null; \
+-	fi
+-	$(MAKE) -C $(LIBFFI_BUILD_DIR)
+-endif
++#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)" \
++#		$(FFI_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)" \
++#		$(FFI_CONFIGURE) > /dev/null; \
++#	fi
++#	$(MAKE) -C $(LIBFFI_BUILD_DIR)
++#endif
+ clean::
+ 	# nothing to do - ant will delete the build dir
+