[meta-oe][PATCH 0/2] Fix mysql_config

[meta-oe][PATCH 0/2] Fix mysql_config

[Paul Eggleton]

A fix for mysql_config that I found was needed to build modphp with
mysql support. I tested building qt4-x11-free and cherokee before and
after this fix; the former was unaffected whereas the latter ended up
with mysql support actually enabled, so this was broken previously
despite having mysql5 in DEPENDS. Hence, also bump PR on cherokee to
force it to rebuild with mysql support.


The following changes since commit 68f05443333afa527e3b24e4caae6115dfb6b6b6:

  opencv: bump PR due libav update (2012-10-05 11:27:25 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/mysqlfix
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/mysqlfix

Paul Eggleton (2):
  mysql: fix include path reported by mysql_config
  cherokee: bump PR to enable mysql support

 .../cherokee/cherokee_1.2.98.bb                    |    2 +-
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.9.5

[meta-oe][PATCH 1/2] mysql: fix include path reported by mysql_config

[Paul Eggleton]

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>
---
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |    4 ++--
 1 file 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 9699dec..40b6b01 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
 }
 
-- 
1.7.9.5

[meta-oe][PATCH 2/2] cherokee: bump PR to enable mysql support

[Paul Eggleton]

This needs a PR bump after the fix to mysql_config.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../cherokee/cherokee_1.2.98.bb                    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
index f481c42..84d6dce 100644
--- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
+++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
@@ -5,7 +5,7 @@ SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-- 
1.7.9.5