diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-19 02:32:33 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-19 02:32:33 +0000 |
| commit | 24debb675d21986fcc1faa39a3591d12d056e0cd (patch) | |
| tree | 4ffe97414f322f69acb106f1d1a91a8eae51334a /packages/mysql | |
| parent | 9373fde9796ab007908d18141783edef558eeff5 (diff) | |
mysql: fix patch
Diffstat (limited to 'packages/mysql')
| -rw-r--r-- | packages/mysql/files/fix_host_path.patch | 25 | ||||
| -rw-r--r-- | packages/mysql/mysql_4.1.22.bb | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/packages/mysql/files/fix_host_path.patch b/packages/mysql/files/fix_host_path.patch index 4ba1cc0838..4f69cd5198 100644 --- a/packages/mysql/files/fix_host_path.patch +++ b/packages/mysql/files/fix_host_path.patch @@ -13,12 +13,25 @@ # for build ndb docs -@@ -527,7 +527,7 @@ else +@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") + + # Check if a pid is valid + AC_PATH_PROG(KILL, kill, kill) ++AC_SUBST(KILL,/bin/kill) + AC_MSG_CHECKING("for kill switches") +-if $ac_cv_path_KILL -0 $$ ++if $KILL -0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" + elif kill -s 0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" + else AC_MSG_WARN([kill -0 to check for pid seems to fail]) - CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" +- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" fi --AC_SUBST(CHECK_PID) -+AC_SUBST(CHECK_PID,/bin/kill) + AC_SUBST(CHECK_PID) AC_MSG_RESULT("$CHECK_PID") - - # We need an ANSI C compiler diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb index c60758b19f..8d7f4057f6 100644 --- a/packages/mysql/mysql_4.1.22.bb +++ b/packages/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ |