Changeset 32256 for gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE

Timestamp:

2018-07-11T17:46:20+12:00 (6 years ago)

Author:

sjm84

Message:

Changes to get xpdftools compiled up on the 32 bit linux LSB, since 32 bit xpdftools binaries is what we hope to use on both 32 and 64 bit machines.

File:

• gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh (modified) (2 diffs)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

@@ -12 +12 @@
 prefix=$GEXTXPDFTOOLS_INSTALLED
 
+# When trying to compile xpdf-tools on a 32 bit linux LSB, we get the error
+# "undefined reference to `__sync_add_and_fetch_4'" unless we follow the instructions at
+# https://stackoverflow.com/questions/130740/link-error-when-compiling-gcc-atomic-operation-in-32-bit-mode
+# and append to CXXFLAGS "-march=i486", which is the earliest architecture for which compilation
+# succeeds and the xpdftool binaries produced work (even though our 32 bit LSB is i686).
+arch=`uname -m`
+if [[ $arch = *"64"* ]]; then
+    arch=
+else
+    echo "@@@ 32 bit unix, passing in -march=i486 to avoid certain linking errors"
+    arch="-march=i486"
+fi
+
 # Use C/CPP/CXX FLAGS and LDFLAGS for further setting up
 # libpng and libz for compiling xpdftools
 export CFLAGS="$CFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
 export CPPFLAGS="$CPPFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
-export CXXFLAGS="$CXXFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
+export CXXFLAGS="$CXXFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15 $arch"
 export LDFLAGS="$LDFLAGS -L$GEXTXPDFTOOLS_INSTALLED/lib"
 
@@ -114 +127 @@
 
 ## For building dynamic xpdf-tools executables, change the above to have the following instead
-## (still unable get the .so for LIBJPEG generated, so could try JPEG_LIBRARY set same as above)
+## The .so for LIBJPEG gets generated for libjpeg version 9c (but not 6b). Correct the .so version number below.
 #       -DZLIB_LIBRARY=$prefix/lib/libz.so.1.2.7 \
 #       -DTIFF_LIBRARY=$prefix/lib/libtiff.so.5.2.2 \
 #       -DPNG_LIBRARY=$prefix/lib/libpng15.so.15.30.0 \
+#       -DJPEG_LIBRARY=$prefix/lib/libjpeg.so.PUT_THE_NUMBER_HERE \
 #       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.so.6.3.20 \
 # (The 3rd line can alternatively be "-DFREETYPE_DIR=$prefix")