diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-06-03 19:58:16 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-06-03 19:58:16 +0000 |
| commit | ec1a6d61ed83e78733cdc78ef0fc7b5e7816f0af (patch) | |
| tree | ee313bc704e636fd1a6f51326e5ab6b6d82616c8 /dev-java/jffi/files | |
| parent | Drop KDE 4.2.2 (diff) | |
| download | gentoo-2-ec1a6d61ed83e78733cdc78ef0fc7b5e7816f0af.tar.gz gentoo-2-ec1a6d61ed83e78733cdc78ef0fc7b5e7816f0af.tar.bz2 gentoo-2-ec1a6d61ed83e78733cdc78ef0fc7b5e7816f0af.zip | |
Revbump that tries to fix flags problems reported in bug #271533. Use virtual/libffi instead of gcc[libffi] as requested in bug #272058. Fix not workin VM selection, bug #272373.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jffi/files')
| -rw-r--r-- | dev-java/jffi/files/0.3-makefile-flags.patch | 30 | ||||
| -rw-r--r-- | dev-java/jffi/files/0.4.1-makefile-flags.patch | 30 |
2 files changed, 60 insertions, 0 deletions
diff --git a/dev-java/jffi/files/0.3-makefile-flags.patch b/dev-java/jffi/files/0.3-makefile-flags.patch new file mode 100644 index 000000000000..780e4c5e62cf --- /dev/null +++ b/dev-java/jffi/files/0.3-makefile-flags.patch @@ -0,0 +1,30 @@ +--- jni/GNUmakefile.orig 2009-06-03 21:32:31.000000000 +0200 ++++ jni/GNUmakefile 2009-06-03 21:34:56.000000000 +0200 +@@ -43,7 +43,7 @@ + # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG + OFLAGS = -O2 $(JFLAGS) +-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses ++WFLAGS = -Wall -Wno-unused -Wno-parentheses + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically + LDFLAGS += $(SOFLAGS) +@@ -55,7 +55,7 @@ + + JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" + IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include" +-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) ++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) + CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE + + ifeq ($(OS),mingw32) +@@ -65,9 +65,6 @@ + ifneq ($(OS),$(BUILD_OS)) + CC ?= i386-mingw32-gcc + LD ?= i386-mingw32-ld +- else +- CC = gcc +- LD = ld + endif + endif + ifneq ($(findstring cygwin,$(BUILD_OS)),) diff --git a/dev-java/jffi/files/0.4.1-makefile-flags.patch b/dev-java/jffi/files/0.4.1-makefile-flags.patch new file mode 100644 index 000000000000..11694b26eccc --- /dev/null +++ b/dev-java/jffi/files/0.4.1-makefile-flags.patch @@ -0,0 +1,30 @@ +--- jni/GNUmakefile.orig 2009-06-03 21:52:34.000000000 +0200 ++++ jni/GNUmakefile 2009-06-03 21:51:50.000000000 +0200 +@@ -42,7 +42,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 = -Wall -Wno-unused -Wno-parentheses -Wundef + endif + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically +@@ -54,7 +54,7 @@ + + JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" + IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include" +-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) ++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) + CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE + + ifeq ($(OS),mingw32) +@@ -64,9 +64,6 @@ + ifneq ($(OS),$(BUILD_OS)) + CC ?= i386-mingw32-gcc + LD ?= i386-mingw32-ld +- else +- CC = gcc +- LD = ld + endif + endif + ifneq ($(findstring cygwin,$(BUILD_OS)),) |