From 93cab50a8ce6dfb50de1eab23ee3fc853ec1278e Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Wed, 28 Jan 2009 17:30:18 +0000
Subject: mysql: Provide config cache for ps checks: * Scripts need target ps,
 not build host ps. * It makes possible to build it on host chroots without
 /proc mounted.

---
 .../mysql/files/configure-ps-cache-check.patch     | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 packages/mysql/files/configure-ps-cache-check.patch

(limited to 'packages/mysql')

diff --git a/packages/mysql/files/configure-ps-cache-check.patch b/packages/mysql/files/configure-ps-cache-check.patch
new file mode 100644
index 0000000000..3b5b3fd063
--- /dev/null
+++ b/packages/mysql/files/configure-ps-cache-check.patch
@@ -0,0 +1,27 @@
+Index: mysql-4.1.22/configure.in
+===================================================================
+--- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
++++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
+@@ -471,8 +471,8 @@
+ 
+ # Lock for PS
+ AC_PATH_PROG(PS, ps, ps)
+-AC_MSG_CHECKING("how to check if pid exists")
+-PS=$ac_cv_path_PS
++AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
++[
+ # Linux style
+ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+ then
+@@ -511,8 +511,9 @@
+       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
+   esac
+ fi
+-AC_SUBST(FIND_PROC)
+-AC_MSG_RESULT("$FIND_PROC")
++ac_cv_FIND_PROC="$FIND_PROC"
++])
++AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
+ 
+ # Check if a pid is valid
+ AC_PATH_PROG(KILL, kill, kill)
-- 
cgit v1.2.3


From 7fcb561081ef66bfbd46ad682adeec2a6e859521 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Wed, 28 Jan 2009 17:30:18 +0000
Subject: mysql: Provide config cache for ps checks: * Scripts need target ps,
 not build host ps. * It makes possible to build it on host chroots without
 /proc mounted.

---
 packages/mysql/mysql_4.1.22.bb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages/mysql')

diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb
index 8d7f4057f6..5d5900c6d2 100644
--- a/packages/mysql/mysql_4.1.22.bb
+++ b/packages/mysql/mysql_4.1.22.bb
@@ -8,6 +8,7 @@ PR = "r2"
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
            file://fix_host_path.patch;patch=1 \
+	   file://configure-ps-cache-check.patch;patch=1 \
            file://my.cnf \
            file://mysqld.sh"
 
@@ -23,6 +24,8 @@ INITSCRIPT_PACKAGES = "mysql-server"
 INITSCRIPT_NAME = "mysqld"
 INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
 
+export ac_cv_path_PS=/bin/ps
+export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null"
 PARALLEL_MAKE = " "
 #EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
-- 
cgit v1.2.3