[GM-commit] GraphicsMagick: Remove CFLAGS and LDFLAGS deduplication code.

[GraphicsMagick C. <gra...@li...>]

changeset 62387f365b84 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=62387f365b84
summary: Remove CFLAGS and LDFLAGS deduplication code.

diffstat:

 ChangeLog                              |   5 +++
 VisualMagick/installer/inc/version.isx |   4 +-
 configure                              |  44 ----------------------------------
 configure.ac                           |  44 ----------------------------------
 magick/version.h                       |   4 +-
 www/Changelog.html                     |   7 +++++
 6 files changed, 16 insertions(+), 92 deletions(-)

diffs (162 lines):

diff -r a23d76171272 -r 62387f365b84 ChangeLog
--- a/ChangeLog	Sun Oct 04 12:42:33 2015 -0500
+++ b/ChangeLog	Mon Oct 05 08:44:32 2015 -0500
@@ -1,3 +1,8 @@
+2015-10-05  Bob Friesenhahn  <bfr...@si...>
+
+	* configure.ac: Remove CFLAGS and LDFLAGS deduplication code.
+	Resolves SourceForge bug #320 OS X "universal build failure".
+
 2015-10-04  Bob Friesenhahn  <bfr...@si...>
 
 	* www/index.rst: Updated for 1.3.22 release.
diff -r a23d76171272 -r 62387f365b84 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Oct 04 12:42:33 2015 -0500
+++ b/VisualMagick/installer/inc/version.isx	Mon Oct 05 08:44:32 2015 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020151004"
-#define public MagickPackageReleaseDate "snapshot-20151004"
+#define public MagickPackageVersionAddendum ".020151005"
+#define public MagickPackageReleaseDate "snapshot-20151005"
diff -r a23d76171272 -r 62387f365b84 configure
--- a/configure	Sun Oct 04 12:42:33 2015 -0500
+++ b/configure	Mon Oct 05 08:44:32 2015 -0500
@@ -30328,50 +30328,6 @@
 
 
 #
-# Deduplicate LDFLAGS
-#
-LDFLAGS_NEW=''
-for flag in $LDFLAGS
-do
-    add=yes
-    for test_flag in $LDFLAGS_NEW
-    do
-        if test $flag = $test_flag
-        then
-            add=no
-            break
-        fi
-    done
-    if test $add = yes
-    then
-        LDFLAGS_NEW="$LDFLAGS_NEW $flag"
-    fi
-done
-LDFLAGS=$LDFLAGS_NEW
-
-#
-# Deduplicate CFLAGS
-#
-CFLAGS_NEW=''
-for flag in $CFLAGS
-do
-    add=yes
-    for test_flag in $CFLAGS_NEW
-    do
-        if test $flag = $test_flag
-        then
-            add=no
-            break
-        fi
-    done
-    if test $add = yes
-    then
-        CFLAGS_NEW="$CFLAGS_NEW $flag"
-    fi
-done
-CFLAGS=$CFLAGS_NEW
-
-#
 # Remove extraneous spaces from output variables (asthetic)
 #
 X_CFLAGS=`echo $X_CFLAGS | sed -e 's/  */ /g'`
diff -r a23d76171272 -r 62387f365b84 configure.ac
--- a/configure.ac	Sun Oct 04 12:42:33 2015 -0500
+++ b/configure.ac	Mon Oct 05 08:44:32 2015 -0500
@@ -3439,50 +3439,6 @@
 AC_SUBST(MAGICK_DEP_LIBS)
 
 #
-# Deduplicate LDFLAGS
-#
-LDFLAGS_NEW=''
-for flag in $LDFLAGS
-do
-    add=yes
-    for test_flag in $LDFLAGS_NEW
-    do
-        if test $flag = $test_flag
-        then
-            add=no
-            break
-        fi
-    done
-    if test $add = yes
-    then
-        LDFLAGS_NEW="$LDFLAGS_NEW $flag"
-    fi
-done
-LDFLAGS=$LDFLAGS_NEW
-
-#
-# Deduplicate CFLAGS
-#
-CFLAGS_NEW=''
-for flag in $CFLAGS
-do
-    add=yes
-    for test_flag in $CFLAGS_NEW
-    do
-        if test $flag = $test_flag
-        then
-            add=no
-            break
-        fi
-    done
-    if test $add = yes
-    then
-        CFLAGS_NEW="$CFLAGS_NEW $flag"
-    fi
-done
-CFLAGS=$CFLAGS_NEW
-
-#
 # Remove extraneous spaces from output variables (asthetic)
 #
 X_CFLAGS=`echo $X_CFLAGS | sed -e 's/  */ /g'`
diff -r a23d76171272 -r 62387f365b84 magick/version.h
--- a/magick/version.h	Sun Oct 04 12:42:33 2015 -0500
+++ b/magick/version.h	Mon Oct 05 08:44:32 2015 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x171400
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 17,14,0
-#define MagickChangeDate   "20151004"
-#define MagickReleaseDate  "snapshot-20151004"
+#define MagickChangeDate   "20151005"
+#define MagickReleaseDate  "snapshot-20151005"
 	
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r a23d76171272 -r 62387f365b84 www/Changelog.html
--- a/www/Changelog.html	Sun Oct 04 12:42:33 2015 -0500
+++ b/www/Changelog.html	Mon Oct 05 08:44:32 2015 -0500
@@ -35,6 +35,13 @@
 <div class="document">
 
 
+<p>2015-10-05  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li>configure.ac: Remove CFLAGS and LDFLAGS deduplication code.
+Resolves SourceForge bug #320 OS X &quot;universal build failure&quot;.</li>
+</ul>
+</blockquote>
 <p>2015-10-04  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">