database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-3826 compilation of client programs fail: m_string.h tries to include <mysql/plugin.h>

Browse Source 
mysql_config:
- add not only $pkgincludedir, but also $pkgincludedir/.. to the header search path,
  for #include <mysql/plugin.h> to work


scripts/mysql_config.sh:
  - don't support headers in */include anymore. only in */include/mysql
  - remove the incorrect "bug fix" (fixed correctly long time ago)
  - add not only $pkgincludedir, but also $pkgincludedir/.. to the header search path,
    for #include <mysql/plugin.h> to work
  - but don't do it, if $pkgincludedir/.. is /usr/include
This commit is contained in:
Sergei Golubchik
2012-11-15 19:20:10 +01:00
parent 53578613e9
commit 3a1fdc9e7f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/mysql_config.sh
View File

@@ -92,11 +92,7 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
pkgincludedir='@pkgincludedir@'
if [ -f "$basedir/include/mysql/mysql.h" ]; then
pkgincludedir="$basedir/include/mysql"
elif [ -f "$basedir/include/mysql.h" ]; then
pkgincludedir="$basedir/include"
fi
fix_path pkgincludedir include/mysql
version='@VERSION@'
socket='@MYSQL_UNIX_ADDR@'
@@ -125,8 +121,11 @@ if [ -r "$pkglibdir/libmygcc.a" ]; then
embedded_libs="$embedded_libs -lmygcc "
fi
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
include="-I$pkgincludedir"
if [ "$basedir" != "/usr" ]; then
include="$include -I$pkgincludedir/.."
fi
cflags="$include @CFLAGS@ " #note: end space!
# Remove some options that a client doesn't have to care about
# FIXME until we have a --cxxflags, we need to remove -Xa