diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-07 16:03:47 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-09 11:05:00 +0200 |
commit | 3f95bb907381ac5fd789452e1330c12f9a8904f9 (patch) | |
tree | d9714a0af1146264bf25b4ace6b18fe220f5f5e6 /meta-oe/recipes-support/mysql | |
parent | 2d7accc6e30fe3e2cea5d3b2f61f25543672b501 (diff) | |
download | meta-openembedded-contrib-3f95bb907381ac5fd789452e1330c12f9a8904f9.tar.gz |
mysql: fix include path reported by mysql_config
mysql_config should point to the directory where the MySQL include files
can be found and not its parent.
This fixes building modphp with mysql enabled, and allows cherokee to
actually enable mysql support.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
-rw-r--r-- | meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 9699dec52a..40b6b01cf8 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" DEPENDS = "ncurses" -PR = "r7" +PR = "r8" SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ file://configure.in.patch \ @@ -42,7 +42,7 @@ SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" # We need to append this so it runs *after* binconfig's preprocess function mysql5_sysroot_preprocess () { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config } |