[arch-commits] Commit in mariadb/trunk (PKGBUILD)

[Christian Hesse]

    Date: Tuesday, May 30, 2017 @ 08:19:18
  Author: eworm
Revision: 296743

pending changes

We are still waiting for upstream to confirm...

https://jira.mariadb.org/browse/MDEV-12935

Modified:
  mariadb/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-30 06:30:52 UTC (rev 296742)
+++ PKGBUILD	2017-05-30 08:19:18 UTC (rev 296743)
@@ -95,10 +95,15 @@
 
   cd build
 
-  for dir in include libmariadb libmysqld libservices; do
+  # IMPORTANT: Install from include dir *last* to have the correct
+  #            header files in place!
+  for dir in libmariadb libmysqld libservices include; do
     make -C $dir DESTDIR="$pkgdir" install
   done
 
+  # a lot of packages need MYSQL_VERSION_ID, so include mysql_version.h for now
+  sed -i '/mariadb_version.h/a #include "mysql_version.h"' "$pkgdir"/usr/include/mysql/mysql.h
+
   # A lot of packages use hard coded library names and link with
   # -lmysqlclient. As upstream renamed the library from
   # libmysqlclient.so to libmariadb.so... Add a workaround for