commit 4f570f58810003fd71ab223045aa9e79ded679c0 Author: Elan Ruusamäe <g...@delfi.ee> Date: Fri Sep 25 10:54:45 2015 +0300
fix x32 openssl detection mysql.spec | 4 +++- x32.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/mysql.spec b/mysql.spec index a60e8b9..60436de 100644 --- a/mysql.spec +++ b/mysql.spec @@ -2,7 +2,7 @@ # - C(XX)FLAGS for innodb subdirs are overriden by ./configure! # - http://bugs.mysql.com/bug.php?id=16470 # NOTE: -# - 5.0 Changes: http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html +# - 5.0 Changes: http://dev.mysql.com/doc/relnotes/mysql/5.0/en/ # # Conditional build: %bcond_without big_tables # Support tables with more than 4G rows even on 32 bit platforms @@ -70,6 +70,7 @@ Patch15: %{name}-system-users.patch Patch16: %{name}-errorlog-no-rename.patch Patch18: %{name}-xtrabackup.patch Patch19: %{name}hotcopy-5.0-5.5.patch +Patch20: x32.patch Patch21: %{name}-atomic.patch Patch22: %{name}-fix-dummy-thread-race-condition.patch # ourdelta @@ -547,6 +548,7 @@ mv sphinx-*/mysqlse sql/sphinx %patch16 -p1 %{?with_xtrabackup:%patch18 -p1} %patch19 -p1 +%patch20 -p1 # <percona %patches> %patch100 -p1 diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..10b73c2 --- /dev/null +++ b/x32.patch @@ -0,0 +1,11 @@ +--- mysql-5.0.96/config/ac-macros/openssl.m4~ 2012-03-02 16:04:12.000000000 +0200 ++++ mysql-5.0.96/config/ac-macros/openssl.m4 2015-09-25 10:47:31.053563769 +0300 +@@ -13,7 +13,7 @@ + done + + for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ +-/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \ ++/usr/lib /usr/lib64 /usr/libx32 /opt/ssl/lib /opt/openssl/lib \ + /usr/freeware/lib32 /usr/local/lib/ ; do + # Test for libssl using all known library file endings + if test -f $d/libssl.a || test -f $d/libssl.so || \ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/4f570f58810003fd71ab223045aa9e79ded679c0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit