Changeset 35198

Timestamp:

2021-06-06T21:35:17+12:00 (3 years ago)

Author:

davidb

Message:

Changes after compiling on a newly updated MacOs machine (Macrocarpa)

Location:

gs2-extensions/imagemagick/trunk/src/packages

Files:

• CASCADE-MAKE/LIBICONV.sh (modified) (1 diff)
• README.txt (modified) (1 diff)
• libiconv-1.16.tar.gz (added)

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

@@ -1 +1 @@
 #!/bin/bash
 
-package=gs-libiconv
-version=-1.14
+package=libiconv
+version=-1.16
 
 progname=$0

gs2-extensions/imagemagick/trunk/src/packages/README.txt

@@ -37 +37 @@
 ******************************
 
+3. 6 June 2021
+davidb
+
+   The above fix (2) is now breaking on newer MacOS version.  Based on a patch note from a software
+   project that was getting the same compiler error:
+
+      https://github.com/jschueller/openturns/commit/9d229efde4f3775578be5bba8104b0e2f419fd67
+
+   it looks like you want to keep Macs away from the #if defined test entirely, e.g., have a
+   precheck like:
+
+     # if !defined(WIN32) && !defined(__APPLE__) /* __GLIBC_PREREQ not defined on mingw or OSX */
+    #   if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)     
+
+    Rather than add more custom fixes, bumping the version of iconv used up to 1.16 which (from
+    a test build) looks to factor all this in.
+