Changeset 31803 for gs2-extensions/imagemagick

Timestamp:

2017-07-13T19:32:21+12:00 (7 years ago)

Author:

ak19

Message:

About 2 fixes to get imagemagick to compile up on Ubuntu v 16.04: 1. Dr Bainbridge fixed up PKGCONFIG.sh to not have lintl in its LIBS, and instead to run the configure command without setting LIBS and without involving lintl (a lib for internationalization, like encoding stuff). The LIBS may be necessary on El Capitan for which Dr Bainbridge appears to have first included the PKG-CONFIG.SH compile script and pkg-config in the first place. So the script now sets the LIBS with lintl for darwin, while for other unix, it doesn't set LIBS but runs configure directly and without lintl. 2. libiconv had a gets vs fgets issue. Fixed with a patch found online. This resulted in a greenstone version of the libiconv version we're using. The patch is now documented in the README.txt folder in imagemagick/packages.

Location:

gs2-extensions/imagemagick/trunk/src/packages

Files:

• CASCADE-MAKE/LIBICONV.sh (modified) (1 diff)
• CASCADE-MAKE/PKG-CONFIG.sh (modified) (1 diff)
• README.txt (added)
• gs-libiconv-1.14.tar.gz (added)

gs2-extensions/imagemagick/trunk/src/packages/CASCADE-MAKE/LIBICONV.sh

@@ -1 +1 @@
 #!/bin/bash
 
-package=libiconv
+package=gs-libiconv
 version=-1.14
 

gs2-extensions/imagemagick/trunk/src/packages/CASCADE-MAKE/PKG-CONFIG.sh

@@ -17 +17 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
-LIBS=-lintl opt_run_configure $force_config $auto_config $package $version $prefix \
-  --with-internal-glib --disable-shared
+if [ "x$GSDLOS" = "xdarwin" ] ; then
+    LIBS=-lintl opt_run_configure $force_config $auto_config $package $version $prefix \
+    --with-internal-glib --disable-shared
+else
+    opt_run_configure $force_config $auto_config $package $version $prefix \
+              --with-internal-glib --disable-shared
+fi
 
 opt_run_make $compile $package $version