Changeset 21432 for main/trunk/greenstone2/common-src/packages/configure

Timestamp:

2010-01-06T17:30:17+13:00 (14 years ago)

Author:

davidb

Message:

Update to use of -m32, which is activated when compiling on a 64-bit machine. The requirement for needing to using -m32 is mg and mg++ (which currently only work with 32-bit sized data-types). If both --disable-mg and --disable-mgpp are specified this means that we don't need to use -m32. Configure files updated to detect this and 'cancel' the -m32 flag.

File:

• main/trunk/greenstone2/common-src/packages/configure (modified) (2 diffs)

main/trunk/greenstone2/common-src/packages/configure

@@ -158 +158 @@
 
 # configure
-echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
+echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
 cd "$PACKAGES/iconv/libiconv-1.13.1" && \
-CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
+CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
 
 # make
@@ -169 +169 @@
 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $HOSTTARGETFLAGS $ENVIRONMENT
+
+if test ! -z "$COMPAT32BITFLAGS" ; then
+  echo "Generating native 64-bit version as well"
+  # used in apache web server, for example
+
+  # dist clean
+  cd "$PACKAGES/iconv/libiconv-1.13.1" 
+  echo make distclean && \
+  make distclean
+
+  # configure
+  echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
+  ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
+
+  # make
+  echo make $HOSTTARGETFLAGS $ENVIRONMENT
+  make $HOSTTARGETFLAGS $ENVIRONMENT
+
+  # make install
+  make install $HOSTTARGETFLAGS $ENVIRONMENT
+  make install $HOSTTARGETFLAGS $ENVIRONMENT
+
+fi
 
 #./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&