Upgrade to 3.22.27.

1 files changed, 53 insertions, 19 deletions

diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 0f4d1b00d253..df2e48cf8abd 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,8 +1,28 @@
---- configure.orig	Mon Apr  5 01:46:35 1999
-+++ configure	Tue Apr  6 23:08:43 1999
-@@ -2199,30 +2199,7 @@
+--- configure.orig	Wed Oct  6 00:10:05 1999
++++ configure	Mon Oct 11 16:35:53 1999
+@@ -2070,8 +2070,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 $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -2085,7 +2085,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'
+@@ -2865,30 +2865,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2201: checking "how to check if pid exists"" >&5
+ echo "configure:2867: checking "how to check if pid exists"" >&5
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -32,7 +52,7 @@
  echo "$ac_t"""$FIND_PROC"" 1>&6
  
  # Check if a pid is valid
-@@ -3684,8 +3661,6 @@
+@@ -4569,8 +4546,6 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -41,22 +61,36 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -3935,14 +3910,6 @@
- else
-   CFLAGS="$CFLAGS -DDBUG_OFF"
-   CXXFLAGS="$CXXFLAGS -DDBUG_OFF"
--  if test "$ac_cv_prog_gcc" = "yes"
--  then
--    CFLAGS="-O6 $CFLAGS"
--    CXXFLAGS="-O $CXXFLAGS"	# Should be -O3 with gcc or g++
--  else
--    CFLAGS="-O $CFLAGS"
--    CXXFLAGS="-O $CXXFLAGS"
--  fi
+@@ -4804,28 +4779,6 @@
  fi
  
- # Force static compilation to avoid linking probles/get more speed
-@@ -7004,7 +6971,7 @@
+ 
+-# Build optimized or debug version ?
+-# First check for gcc and g++
+-if test "$ac_cv_prog_gcc" = "yes"
+-then
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC="-O"
+-  OPTIMIZE_CFLAGS="-O6"
+-else
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC=""
+-  OPTIMIZE_CFLAGS="-O"
+-fi
+-if test "$ac_cv_prog_cxx_g" = "yes"
+-then
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX="-O"
+-  OPTIMIZE_CXXFLAGS="-O3"
+-else
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX=""
+-  OPTIMIZE_CXXFLAGS="-O"
+-fi
+ # Check whether --with-debug or --without-debug was given.
+ if test "${with_debug+set}" = set; then
+   withval="$with_debug"
+@@ -8064,7 +8017,7 @@
      echo ""
      echo "Configuring MIT Pthreads"
      # We will never install so installation paths are not needed.