Changeset 30203 for main

Timestamp:

2015-09-04T20:36:45+12:00 (9 years ago)

Author:

ak19

Message:

Propagating ARCH_DEP_FLAGS to allow successful GS compilation on the 32 bit Mac Leopard using a 64 bit JDK 6: -m64 flag needs to propagate into mg and mgpp to get JNI to work during runtime (with mg/mgpp collections using gdbm).

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/jni/Makefile.in (modified) (1 diff)
• mg/src/text/Makefile.in (modified) (1 diff)
• mgpp/jni/Makefile.in (modified) (1 diff)
• mgpp/text/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in

@@ -20 +20 @@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
 #NOTE: libmgtext.a needs to come before libmglib.a !!!
 QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@

main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

@@ -63 +63 @@
 
 COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
+LINK = $(CC) $(LDFLAGS) @ARCH_DEP_FLAGS@ -o $@
 
 .SUFFIXES:

main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

@@ -33 +33 @@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
 

main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

@@ -74 +74 @@
 COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CFLAGS)
 CXXCOMPILE = $(CXX) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CXXFLAGS)
-LINK = $(CXX) $(LDFLAGS) -o $@
+LINK = $(CXX) $(LDFLAGS) @ARCH_DEP_FLAGS@ -o $@
 
 .SUFFIXES: