| 1 |
ali_bush 09/12/30 11:38:49 |
| 2 |
|
| 3 |
Added: 3.2.4-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/jna/files/3.2.4-makefile-flags.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jna/files/3.2.4-makefile-flags.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jna/files/3.2.4-makefile-flags.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 3.2.4-makefile-flags.patch |
| 15 |
=================================================================== |
| 16 |
--- native/Makefile.orig 2009-12-30 20:13:34.000000000 +1300 |
| 17 |
+++ native/Makefile 2009-12-30 20:21:39.000000000 +1300 |
| 18 |
@@ -54,7 +54,6 @@ |
| 19 |
LIBSFX=.so |
| 20 |
ARSFX=.a |
| 21 |
JNISFX=$(LIBSFX) |
| 22 |
-CC=gcc |
| 23 |
LD=gcc |
| 24 |
LIBS= |
| 25 |
# Default to Sun recommendations for JNI compilation |
| 26 |
@@ -67,10 +65,10 @@ |
| 27 |
COUT=-o $@ |
| 28 |
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include |
| 29 |
CDEFINES=-D_REENTRANT |
| 30 |
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses |
| 31 |
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 32 |
+PCFLAGS=-Wall -Wno-unused -Wno-parentheses |
| 33 |
+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 34 |
-DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' |
| 35 |
-LDFLAGS=-o $@ -shared |
| 36 |
+LDFLAGS+= -o $@ -shared |
| 37 |
ifeq ($(DYNAMIC_LIBFFI),true) |
| 38 |
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) |
| 39 |
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) |
| 40 |
@@ -109,7 +107,7 @@ |
| 41 |
ifneq ($(MINGW),) |
| 42 |
CC = $(MINGW) -m64 -mno-cygwin |
| 43 |
LD = $(CC) |
| 44 |
-LDFLAGS=-o $@ -shared |
| 45 |
+LDFLAGS+= -o $@ -shared |
| 46 |
LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt |
| 47 |
FFI_CONFIG += --host=x86_64-pc-mingw32 |
| 48 |
else |
| 49 |
@@ -129,14 +127,14 @@ |
| 50 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 51 |
PCFLAGS+=-fPIC |
| 52 |
CDEFINES+=-DHAVE_PROTECTION |
| 53 |
-LDFLAGS+=-Wl,-soname,$@ |
| 54 |
+LDFLAGS+= -Wl,-soname,$(shell basename $@) |
| 55 |
endif |
| 56 |
|
| 57 |
ifeq ($(OS),freebsd) |
| 58 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 59 |
PCFLAGS+=-fPIC |
| 60 |
CINCLUDES+=-I/usr/X11R6/include |
| 61 |
-LDFLAGS=-o $@ -shared |
| 62 |
+LDFLAGS+=-o $@ -shared |
| 63 |
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT |
| 64 |
endif |
| 65 |
|
| 66 |
@@ -144,7 +142,7 @@ |
| 67 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 68 |
PCFLAGS+=-fPIC |
| 69 |
CINCLUDES+=-I/usr/X11R6/include |
| 70 |
-LDFLAGS=-o $@ -shared |
| 71 |
+LDFLAGS+= -o $@ -shared |
| 72 |
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT |
| 73 |
endif |
| 74 |
|
| 75 |
@@ -191,7 +189,7 @@ |
| 76 |
endif |
| 77 |
PCFLAGS+=$(ISYSROOT) -x objective-c |
| 78 |
CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT |
| 79 |
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ |
| 80 |
+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ |
| 81 |
-compatibility_version $(shell echo ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ |
| 82 |
-current_version $(VERSION) \ |
| 83 |
-mmacosx-version-min=10.3 \ |
Archives