Drop cray check while keeping the rest.

diff --git a/mysql-build.patch b/mysql-build.patch
index 30148d68480e51399880715d2cb7f6380b0c3392..0f55fe0294741623c8806702d0be22581c3cf17a 100644 (file)
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -36,3 +36,28 @@ index bd26e584bfe..33ac021ec76 100644
    if test -n "$tmp"
    then
       STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
+
+--- mysql-5.0.96.org/config/ac-macros/alloca.m4        2012-03-02 15:04:09.000000000 +0100
++++ mysql-5.0.96/config/ac-macros/alloca.m4    2022-10-18 10:49:46.076063461 +0200
+@@ -45,21 +45,6 @@
+    # use ar to extract alloca.o from them instead of compiling alloca.c.
+    ALLOCA=alloca.o
+    AC_DEFINE(C_ALLOCA, 1)
+- 
+- AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray,
+- [AC_EGREP_CPP(webecray,
+- [#if defined(CRAY) && ! defined(CRAY2)
+- webecray
+- #else
+- wenotbecray
+- #endif
+- ], ac_cv_os_cray=yes, ac_cv_os_cray=no)])
+- if test "$ac_cv_os_cray" = "yes"; then
+- for ac_func in _getb67 GETB67 getb67; do
+-   AC_CHECK_FUNC($ac_func, [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func)
+-   break])
+- done
+- fi
+  fi
+  AC_SUBST(ALLOCA)dnl
+ else

diff --git a/mysql.spec b/mysql.spec
index dd3f474b1db41b2b7e3382f923f06adede77e683..f5f6fcf0010ce1b03bc21e36515c40afc95f696e 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -590,7 +590,6 @@ mv sphinx-*/mysqlse sql/sphinx
 %{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 
 %build
-:> config/ac-macros/alloca.m4
 %{__libtoolize}
 %{__aclocal} -I config/ac-macros
 %{__automake}