bk commit into 5.0 tree (msvensson:1.1855) BUG#9714

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1855 05/04/15 12:38:32 msvensson@neptunus.(none) +1 -0
  BUG#9263 and BUG#9714
   - Modify the part of configure.in that selects wheter to use libsupc++ or MYSYSY_NEW to simpler implementation and reuse existing varaibles.
   - Added sed script to replace all -mcpu in CXXFLAGS and CFLAGS with -mtune if gcc/g++ version is above 3.4.*   

  configure.in
    1.279 05/04/15 12:38:26 msvensson@neptunus.(none) +28 -6
    Easier impl for libsupc++/MYSYS_NEW
    Sed -mcpu to -mtune

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug9263

--- 1.278/configure.in	2005-04-01 11:10:44 +02:00
+++ 1.279/configure.in	2005-04-15 12:38:26 +02:00
@@ -349,14 +349,36 @@
   # we will gets some problems when linking static programs.
   # The following code is used to fix this problem.
 
-  if echo $CXX | grep gcc > /dev/null 2>&1
+  CXX_VERNO=`echo $CXX_VERSION | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`
+
+  if test "$CXX" = "gcc"
   then
-    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
-    then
-     # Statically link the language support function's found in libsupc++.a
-     LIBS="$LIBS -lsupc++"
-    fi
+    case "$CXX_VERNO---$SYSTEM_TYPE" in
+      3.4.*---|3.5.*---|4.*---)
+        LIBS="$LIBS -lsupc++"
+        echo "Using -lsupc++ for static linking with gcc"
+      ;;
+      3.*---freebsd*|*)
+        # Using -lsupc++ doesn't work in
+        # * gcc 3.3 on SuSE 9.2
+        #   (causes link failures when linking things staticly)
+        # * some versions of gcc on freebsd has a libsupc++ that needs
+        #   to link functions from libstdc++, and that's exactly what
+        #   we don't want!
+        CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"
+        echo "Using MYSYS_NEW for static linking with gcc"
+      ;;
+    esac
   fi
+
+  case "$CXX_VERNO" in
+    3.4.*|3.5.*|4.*)
+      # Change -mcpu to -mtune
+      CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-mcpu/-mtune/g'`
+      CFLAGS=`echo $CFLAGS | sed -e 's/-mcpu/-mtune/g'`
+      echo "Using -mtune instead of -mcpu"
+    ;;
+  esac
 fi
 
 # Avoid bug in fcntl on some versions of linux