[packages/mysql/MYSQL_5_0] Drop cray check while keeping the rest.
arekm
arekm at pld-linux.org
Tue Oct 18 10:56:07 CEST 2022
commit c4444ce745e3d3948d8a2fb67e0add04e2bef4db
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Oct 18 10:53:08 2022 +0200
Drop cray check while keeping the rest.
mysql-build.patch | 25 +++++++++++++++++++++++++
mysql.spec | 1 -
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/mysql.spec b/mysql.spec
index dd3f474..f5f6fcf 100644
--- 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}
diff --git a/mysql-build.patch b/mysql-build.patch
index 30148d6..0f55fe0 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/c4444ce745e3d3948d8a2fb67e0add04e2bef4db
More information about the pld-cvs-commit
mailing list