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

Timestamp:

2018-07-10T18:32:20+12:00 (6 years ago)

Author:

ak19

Message:

1. Getting LIBJPEG to compile on Mac requires not passing --enable-static. On Mac too, compiling LIBJPEG also only produces .a (and no .so/.dylib) no matter what, but that happens to be what we want anyway. 2. Turning off building shared libraries (--disable-shared) for all libraries we build that are used by xpdftools, so that on Mac it hopefully chooses to link these in (which won't happen if there's a preferred dylib elsewhere, particularly on the system, which will then get linked in in preference on Macs). Still need to test these changes on Linux again.

Location:

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE

Files:

• FREETYPE.sh (modified) (1 diff)
• LIBJPEG.sh (modified) (1 diff)
• LIBPNG.sh (modified) (1 diff)
• LIBTIFF.sh (modified) (1 diff)
• LIBZ.sh (modified) (1 diff)

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

@@ -14 +14 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version "$prefix"
+opt_run_configure $force_config $auto_config $package $version "$prefix" --enable-static --disable-shared
 
 opt_run_make $compile   $package $version

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

@@ -42 +42 @@
 # http://www.linuxfromscratch.org/blfs/view/6.3/general/libjpeg.html
 # only the libjpeg.a is produced with this command
-opt_run_configure $force_config $auto_config $package $version "$prefix" \
-    --enable-static --enable-shared
+opt_run_configure $force_config $auto_config $package $version "$prefix"
+#opt_run_configure $force_config $auto_config $package $version "$prefix" \
+#    --enable-static --enable-shared
+#         --host=x86_64-linux-gnu --build=x86_64-linux-gnu --target=x86_64-linux-gnu --enable-static --enable-shared
 # The following didn't fix the configuration and subsequent libtool error described above
 # and with or without it, there's still reference to host=x86_64-unknown(-unknown)-linux-gnu in configure output:

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

@@ -20 +20 @@
 opt_run_untar $force_untar $auto_untar $package $version
 
-opt_run_configure $force_config $auto_config $package $version $prefix
+opt_run_configure $force_config $auto_config $package $version $prefix --enable-static --disable-shared
 
 opt_run_make $compile $package $version

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

@@ -14 +14 @@
 
 opt_run_untar $force_untar $auto_untar $package $version 
-opt_run_configure $force_config $auto_config $package $version "$prefix"
+opt_run_configure $force_config $auto_config $package $version "$prefix" --enable-static --disable-shared
 
 opt_run_make $compile   $package $version

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

@@ -30 +30 @@
 fi
 
+# We don't want the generated .so/.dylibs on linux and mac,  just the .a static libs
+# According to https://github.com/luvit/zlib/blob/master/configure
+# "Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static"
 if [ $force_config = "1" ] ; then
     echo "[pushd $package$version]"
     ( cd $package$version ; \
-      echo $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; \
-      eval $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ )
+      echo $CROSSCONFIGURE_VARS ./configure --static --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; \
+      eval $CROSSCONFIGURE_VARS ./configure --static --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ )
     if [ $? != 0 ] ; then
         echo "      Error encountered running *configure* stage of $progname"