GraphicsMagick: 2 new changesets

changeset c141782de67a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=c141782de67a
summary: GCC 12 thinks GetClientName() and MagickGetImageSavedType() should be pure functions.

changeset 49b1b6dcb93f in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=49b1b6dcb93f
summary: Update bundled config.guess/config.sub

diffstat:

 config/config.guess |  36 +++++++++++++++++++++++++-----------
 config/config.sub   |   4 ++--
 magick/utility.h    |   2 +-
 wand/magick_wand.h  |   2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diffs (115 lines):

diff -r 0be94bd5eb72 -r 49b1b6dcb93f config/config.guess
--- a/config/config.guess	Sun Sep 18 09:12:22 2022 -0500
+++ b/config/config.guess	Wed Sep 21 15:17:32 2022 -0500
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-01-09'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1036,7 +1036,7 @@
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
     m32r*:Linux:*:*)
@@ -1151,16 +1151,27 @@
 	;;
     x86_64:Linux:*:*)
 	set_cc_for_build
+	CPU=$UNAME_MACHINE
 	LIBCABI=$LIBC
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_X32 >/dev/null
-	    then
-		LIBCABI=${LIBC}x32
-	    fi
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __i386__
+	    ABI=x86
+	    #else
+	    #ifdef __ILP32__
+	    ABI=x32
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		x86) CPU=i686 ;;
+		x32) LIBCABI=${LIBC}x32 ;;
+	    esac
 	fi
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	GUESS=$CPU-pc-linux-$LIBCABI
 	;;
     xtensa*:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1367,8 +1378,11 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	GUESS=i586-pc-haiku
 	;;
-    x86_64:Haiku:*:*)
-	GUESS=x86_64-unknown-haiku
+    ppc:Haiku:*:*)	# Haiku running on Apple PowerPC
+	GUESS=powerpc-apple-haiku
+	;;
+    *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
+	GUESS=$UNAME_MACHINE-unknown-haiku
 	;;
     SX-4:SUPER-UX:*:*)
 	GUESS=sx4-nec-superux$UNAME_RELEASE
diff -r 0be94bd5eb72 -r 49b1b6dcb93f config/config.sub
--- a/config/config.sub	Sun Sep 18 09:12:22 2022 -0500
+++ b/config/config.sub	Wed Sep 21 15:17:32 2022 -0500
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-01-03'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1207,7 +1207,7 @@
 			| k1om \
 			| le32 | le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 | loongarchx32 \
+			| loongarch32 | loongarch64 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
diff -r 0be94bd5eb72 -r 49b1b6dcb93f magick/utility.h
--- a/magick/utility.h	Sun Sep 18 09:12:22 2022 -0500
+++ b/magick/utility.h	Wed Sep 21 15:17:32 2022 -0500
@@ -79,7 +79,7 @@
 
 extern MagickExport const char
   *GetClientFilename(void) MAGICK_FUNC_CONST,
-  *GetClientName(void) MAGICK_FUNC_CONST,
+  *GetClientName(void) MAGICK_FUNC_PURE,
   *GetClientPath(void) MAGICK_FUNC_CONST,
   *SetClientFilename(const char *),
   *SetClientName(const char *),
diff -r 0be94bd5eb72 -r 49b1b6dcb93f wand/magick_wand.h
--- a/wand/magick_wand.h	Sun Sep 18 09:12:22 2022 -0500
+++ b/wand/magick_wand.h	Wed Sep 21 15:17:32 2022 -0500
@@ -98,7 +98,7 @@
   MagickGetImageType(MagickWand *);
 
 extern WandExport ImageType
-  MagickGetImageSavedType(MagickWand *) MAGICK_FUNC_CONST;
+  MagickGetImageSavedType(MagickWand *) MAGICK_FUNC_PURE;
 
 extern WandExport InterlaceType
   MagickGetImageInterlaceScheme(MagickWand *);