diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-30 13:25:14 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-30 13:25:14 +0100 |
| commit | c74e1d46b68f67f059050263ebb434a3d7344657 (patch) | |
| tree | 0e913a2f32296da798ba6cd4a9f3dcea26da43c4 /packages/mysql | |
| parent | 2466a29b608e4725de8e71e4c38618b0b9bfe088 (diff) | |
| parent | c49f410e88a5828c198ebbe3f781bc9e5ab1a347 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/mysql')
| -rw-r--r-- | packages/mysql/files/configure-ps-cache-check.patch | 27 | ||||
| -rw-r--r-- | packages/mysql/mysql_4.1.22.bb | 3 |
2 files changed, 30 insertions, 0 deletions
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) 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 " |