| 1 |
ali_bush 09/12/30 06:36:20 |
| 2 |
|
| 3 |
Added: 0.6.0.2-makefile-flags.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.1.7.16/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/jffi/files/0.6.0.2-makefile-flags.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/files/0.6.0.2-makefile-flags.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/files/0.6.0.2-makefile-flags.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0.6.0.2-makefile-flags.patch |
| 15 |
=================================================================== |
| 16 |
--- jni/GNUmakefile.orig 2009-12-30 18:59:22.000000000 +1300 |
| 17 |
+++ jni/GNUmakefile 2009-12-30 19:02:10.000000000 +1300 |
| 18 |
@@ -42,7 +42,7 @@ |
| 19 |
|
| 20 |
# MacOS headers aren't completely warning free, so turn them off |
| 21 |
ifneq ($(OS),darwin) |
| 22 |
- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef |
| 23 |
+ WFLAGS = -Wno-unused -Wno-parentheses -Wundef |
| 24 |
endif |
| 25 |
PICFLAGS = -fPIC |
| 26 |
SOFLAGS = # Filled in for each OS specifically |
| 27 |
@@ -54,8 +54,8 @@ |
| 28 |
STRIP = strip -S |
| 29 |
|
| 30 |
JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" |
| 31 |
-IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include |
| 32 |
-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) |
| 33 |
+IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)" |
| 34 |
+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) |
| 35 |
CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE |
| 36 |
|
| 37 |
ifeq ($(OS),cross-mingw32) |
| 38 |
@@ -147,11 +147,11 @@ |
| 39 |
endif |
| 40 |
|
| 41 |
LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT) |
| 42 |
-FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \ |
| 43 |
- --with-pic=yes --disable-dependency-tracking |
| 44 |
-ifdef CONFIGURE_HOST |
| 45 |
- FFI_CONFIGURE += --host=$(CONFIGURE_HOST) |
| 46 |
-endif |
| 47 |
+#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \ |
| 48 |
+# --with-pic=yes --disable-dependency-tracking |
| 49 |
+#ifdef CONFIGURE_HOST |
| 50 |
+# FFI_CONFIGURE += --host=$(CONFIGURE_HOST) |
| 51 |
+#endif |
| 52 |
all: $(LIBJFFI) |
| 53 |
|
| 54 |
debug: |
| 55 |
@@ -211,12 +211,6 @@ |
| 56 |
else |
| 57 |
$(LIBFFI): |
| 58 |
@mkdir -p $(LIBFFI_BUILD_DIR) |
| 59 |
- @if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \ |
| 60 |
- echo "Configuring libffi for $(PLATFORM)"; \ |
| 61 |
- cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \ |
| 62 |
- $(FFI_CONFIGURE) > /dev/null; \ |
| 63 |
- fi |
| 64 |
- $(MAKE) -C $(LIBFFI_BUILD_DIR) |
| 65 |
endif |
| 66 |
clean:: |
| 67 |
# nothing to do - ant will delete the build dir |
Archives