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

Timestamp:

2018-07-10T21:02:50+12:00 (6 years ago)

Author:

ak19

Message:

1. Adding in the files required for xpdf-tools' licence in new folder redistribute. This is copied into the distribution tarball. 2. toplevel CASCADE-MAKE.sh' makedist commands creates includes customised content into the distribution tarball: just the pdf bins and the xpdf-tools licensing files (including, as specified in the licence, the xpdf man pages generated during building). 3. Found a newer version of libjpeg src: version 9c from 2018, versus the older version 6b from 2008. This builds without requiring the old patch for 64 bit machines. However, LIBJPEG.sh needed further modification: instead of the install-lib make target, the install-lib equivalent now has a longer target name. Version 9c is able to produce both libjpeg.a and libjpeg.so/.dylib. We specifically want only the former to be generated, so we now have to tell configure to disable-shared (which was the only mode for the older libjpeg version 6b). We're now also copying certain header files across to the installed area's include subfolder, as speficied in the install.txt for the new and older versions of libjpeg.

File:

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

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

@@ -2 +2 @@
 
 package=jpeg
-version=-6b
+#version=-6b
+# version 9c is from 2018, see www.ijg.org. Version 6b is from 2008
+version=-9c
+
+# renamed the downloaded jpegsrc.v9c.tar.gz to jpeg$version.tar.gz
+# similarly for the earlier 6b version.
 
 progname=$0
@@ -28 +33 @@
 #        Error encountered running *make * stage of ./CASCADE-MAKE/LIBJPEG.sh
 # The solution is taken from https://sourceforge.net/p/libjpeg/bugs/12/
-if [[ -d "$package$version" && -f "gs-libjpeg-config.sub" ]]; then
-    echo "*******************************************************************"
-    echo "Using our custom gs-libjpeg-config.sub instead of the one included in $package$version"
-    echo "Copying across gs-libjpeg-config.sub as $package$version/config.sub"
-    echo "*******************************************************************"
-    echo `pwd`
-    cp "gs-libjpeg-config.sub" "$package$version/config.sub"
-fi
+##if [[ -d "$package$version" && -f "gs-libjpeg-config.sub" ]]; then
+##    echo "*******************************************************************"
+##    echo "Using our custom gs-libjpeg-config.sub instead of the one included in $package$version"
+##    echo "Copying across gs-libjpeg-config.sub as $package$version/config.sub"
+##    echo "*******************************************************************"
+##    echo `pwd`
+##    cp "gs-libjpeg-config.sub" "$package$version/config.sub"
+##fi
 
 # This also seems to make only the static libjpeg.a
@@ -42 +47 @@
 # 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"
+opt_run_configure $force_config $auto_config $package $version "$prefix" --disable-shared
 #opt_run_configure $force_config $auto_config $package $version "$prefix" \
 #    --enable-static --enable-shared
@@ -51 +56 @@
 
 opt_run_make $compile   $package $version
-opt_run_make $install   $package $version "install-lib"
+#opt_run_make $install   $package $version "install-lib"
+# Contrary to the install.txt in version jpeg version 9c, install-lib is an unrecognised make command
+# I found there was an install-libLTLIBRARIES target in the Makefile, however. And that seems to at least copy over libjpeg.a
+opt_run_make $install   $package $version "install-libLTLIBRARIES"
 opt_run_make $clean     $package $version "clean"
 opt_run_make $distclean $package $version "distclean"
@@ -57 +65 @@
 opt_run_tarclean $tarclean $package $version
 
+# according to jpeg version 9c's install.txt, these 4 header files need to be copied into the include folder (besides installing libjpeg.a)
+# if building something against the libjpeg library, as we do with xpdf-tools 
+cp $package$version/jpeglib.h $package$version/jerror.h $package$version/jconfig.h $package$version/jmorecfg.h $GEXTXPDFTOOLS_INSTALLED/include/.
+