Commit db4f8379 authored by omega8cc's avatar omega8cc

Critical: PHP build is broken with latest MariaDB 5.5.40 - fixes #452 in head

parent 07a27949
......@@ -7471,6 +7471,14 @@ switch_php_cli () {
fi
}
_THIS_DB_VERSION=`mysql -V 2>&1 | tr -d "\n" | cut -d" " -f6 | awk '{ print $1}' | cut -d"-" -f1 | awk '{ print $1}' | sed "s/[\,']//g"`
if [ "$_THIS_DB_VERSION" = "5.5.40" ] && [ ! -e "/var/xdrago/log/my_config-$_THIS_DB_VERSION-fixed.log" ] ; then
_PHP_FORCE_REINSTALL=YES
cd /usr/include/mysql/
patch -p1 < /opt/tmp/$_BOA_REPO_NAME/aegir/patches/my_config.h.patch &> /dev/null
touch /var/xdrago/log/my_config-$_THIS_DB_VERSION-fixed.log
fi
if [[ "$_PHP_MULTI_INSTALL" =~ "5.2" ]] && [ ! -x "/opt/php52/bin/php" ] ; then
_PHP_VERSION="$_PHP52_VERSION"
msg "INFO: PHP $_PHP_VERSION will be installed now"
......
diff -burp a/my_config.h b/my_config.h
--- a/my_config.h 2014-10-09 19:32:46.000000000 -0400
+++ b/my_config.h 2014-10-09 19:35:12.000000000 -0400
@@ -641,17 +641,4 @@
#define SIZEOF_TIME_T 8
/* #undef TIME_T_UNSIGNED */
-/*
- stat structure (from <sys/stat.h>) is conditionally defined
- to have different layout and size depending on the defined macros.
- The correct macro is defined in my_config.h, which means it MUST be
- included first (or at least before <features.h> - so, practically,
- before including any system headers).
-
- __GLIBC__ is defined in <features.h>
-*/
-#ifdef __GLIBC__
-#error <my_config.h> MUST be included first!
-#endif
-
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment