From 83a640b2c4feb53e43a61c21c10d5003d3a391a1 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Mon, 30 Apr 2001 08:10:16 +0000
Subject: [PATCH] Don't hard-code -O2 and various -f optimizations in CXXFLAGS

---
 x11-toolkits/fox-devel/files/patch-ad | 42 +++++++++++++++++++++++----
 x11-toolkits/fox/files/patch-ad       | 42 +++++++++++++++++++++++----
 x11-toolkits/fox10/files/patch-ad     | 42 +++++++++++++++++++++++----
 x11-toolkits/fox14/files/patch-ad     | 42 +++++++++++++++++++++++----
 4 files changed, 148 insertions(+), 20 deletions(-)

diff --git a/x11-toolkits/fox-devel/files/patch-ad b/x11-toolkits/fox-devel/files/patch-ad
index e87350549e27..dd0e9e23e6d5 100644
--- a/x11-toolkits/fox-devel/files/patch-ad
+++ b/x11-toolkits/fox-devel/files/patch-ad
@@ -1,11 +1,43 @@
---- configure	Mon Mar  6 13:25:50 2000
-+++ configure.new	Mon Mar  6 13:33:37 2000
-@@ -3561,7 +3561,10 @@
+--- configure.orig	Wed Apr  4 13:25:59 2001
++++ configure	Mon Apr 30 00:42:01 2001
+@@ -839,8 +839,6 @@
+ 
+ 
+ 
+-CXXFLAGS=""
+-
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+ echo "configure:846: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+@@ -1748,8 +1746,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1763,7 +1761,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -3440,9 +3438,12 @@
+ 
+ echo "$ac_t""$enable_release" 1>&6
  if test "x$enable_release" = "xyes" ; then
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+-CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++CXXFLAGS="${CXXFLAGS} -DNDEBUG"
  if test "${GXX}" = "yes" ; then
 -CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations"
++CXXFLAGS="${CXXFLAGS}"
 +if test "${with_profiling}" = ""; then
 +CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
 +fi
diff --git a/x11-toolkits/fox/files/patch-ad b/x11-toolkits/fox/files/patch-ad
index e87350549e27..dd0e9e23e6d5 100644
--- a/x11-toolkits/fox/files/patch-ad
+++ b/x11-toolkits/fox/files/patch-ad
@@ -1,11 +1,43 @@
---- configure	Mon Mar  6 13:25:50 2000
-+++ configure.new	Mon Mar  6 13:33:37 2000
-@@ -3561,7 +3561,10 @@
+--- configure.orig	Wed Apr  4 13:25:59 2001
++++ configure	Mon Apr 30 00:42:01 2001
+@@ -839,8 +839,6 @@
+ 
+ 
+ 
+-CXXFLAGS=""
+-
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+ echo "configure:846: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+@@ -1748,8 +1746,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1763,7 +1761,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -3440,9 +3438,12 @@
+ 
+ echo "$ac_t""$enable_release" 1>&6
  if test "x$enable_release" = "xyes" ; then
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+-CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++CXXFLAGS="${CXXFLAGS} -DNDEBUG"
  if test "${GXX}" = "yes" ; then
 -CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations"
++CXXFLAGS="${CXXFLAGS}"
 +if test "${with_profiling}" = ""; then
 +CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
 +fi
diff --git a/x11-toolkits/fox10/files/patch-ad b/x11-toolkits/fox10/files/patch-ad
index e87350549e27..dd0e9e23e6d5 100644
--- a/x11-toolkits/fox10/files/patch-ad
+++ b/x11-toolkits/fox10/files/patch-ad
@@ -1,11 +1,43 @@
---- configure	Mon Mar  6 13:25:50 2000
-+++ configure.new	Mon Mar  6 13:33:37 2000
-@@ -3561,7 +3561,10 @@
+--- configure.orig	Wed Apr  4 13:25:59 2001
++++ configure	Mon Apr 30 00:42:01 2001
+@@ -839,8 +839,6 @@
+ 
+ 
+ 
+-CXXFLAGS=""
+-
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+ echo "configure:846: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+@@ -1748,8 +1746,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1763,7 +1761,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -3440,9 +3438,12 @@
+ 
+ echo "$ac_t""$enable_release" 1>&6
  if test "x$enable_release" = "xyes" ; then
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+-CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++CXXFLAGS="${CXXFLAGS} -DNDEBUG"
  if test "${GXX}" = "yes" ; then
 -CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations"
++CXXFLAGS="${CXXFLAGS}"
 +if test "${with_profiling}" = ""; then
 +CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
 +fi
diff --git a/x11-toolkits/fox14/files/patch-ad b/x11-toolkits/fox14/files/patch-ad
index e87350549e27..dd0e9e23e6d5 100644
--- a/x11-toolkits/fox14/files/patch-ad
+++ b/x11-toolkits/fox14/files/patch-ad
@@ -1,11 +1,43 @@
---- configure	Mon Mar  6 13:25:50 2000
-+++ configure.new	Mon Mar  6 13:33:37 2000
-@@ -3561,7 +3561,10 @@
+--- configure.orig	Wed Apr  4 13:25:59 2001
++++ configure	Mon Apr 30 00:42:01 2001
+@@ -839,8 +839,6 @@
+ 
+ 
+ 
+-CXXFLAGS=""
+-
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+ echo "configure:846: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+@@ -1748,8 +1746,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1763,7 +1761,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -3440,9 +3438,12 @@
+ 
+ echo "$ac_t""$enable_release" 1>&6
  if test "x$enable_release" = "xyes" ; then
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+-CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
++CXXFLAGS="${CXXFLAGS} -DNDEBUG"
  if test "${GXX}" = "yes" ; then
 -CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations"
++CXXFLAGS="${CXXFLAGS}"
 +if test "${with_profiling}" = ""; then
 +CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
 +fi