diff options
author | Carsten Lohrke <carlo@gentoo.org> | 2004-08-19 23:50:14 +0000 |
---|---|---|
committer | Carsten Lohrke <carlo@gentoo.org> | 2004-08-19 23:50:14 +0000 |
commit | 59962cb0e1640dc6b8988f99227374c12d673775 (patch) | |
tree | bbc4c109d52055ddc3e7a2979129fdc876e99c71 /dev-db/mysqlcc/files | |
parent | ppc profile update (diff) | |
download | historical-59962cb0e1640dc6b8988f99227374c12d673775.tar.gz historical-59962cb0e1640dc6b8988f99227374c12d673775.tar.bz2 historical-59962cb0e1640dc6b8988f99227374c12d673775.zip |
stable on x86, will be package.masked shortly, #60745
Diffstat (limited to 'dev-db/mysqlcc/files')
-rw-r--r-- | dev-db/mysqlcc/files/digest-mysqlcc-0.9.3 | 1 | ||||
-rw-r--r-- | dev-db/mysqlcc/files/digest-mysqlcc-0.9.4-r1 (renamed from dev-db/mysqlcc/files/digest-mysqlcc-0.9.4) | 0 | ||||
-rw-r--r-- | dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch | 46 | ||||
-rw-r--r-- | dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch | 14 |
4 files changed, 14 insertions, 47 deletions
diff --git a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3 b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3 deleted file mode 100644 index 61b867889804..000000000000 --- a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 9d49fa0658cd8cf81ee5f64bc942b4e9 mysqlcc-0.9.3-src.tar.gz 746154 diff --git a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4 b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4-r1 index fc4c802ddded..fc4c802ddded 100644 --- a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4 +++ b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4-r1 diff --git a/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch b/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch deleted file mode 100644 index f6db1a6a6bd1..000000000000 --- a/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- acinclude.m4.orig 2003-03-04 01:07:26.000000000 -0800 -+++ acinclude.m4 2003-03-04 12:46:35.000000000 -0800 -@@ -6,34 +6,15 @@ - AC_MSG_CHECKING([for libmysqlclient]) - AC_MSG_RESULT() - -- mysql_ok=no -- -- SAVE_LIBS=$LIBS -- -- mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \ -- /usr/local/lib /usr/local/lib/mysql \ -- /usr/local/mysql/lib" -- -- for dir in $mysql_lib; do -- if test "x$mysql_found" != "xyes" -- then -- AC_CHECK_FILE("$dir/libmysqlclient.a", -- mysql_found=yes, mysql_found=no) -- if test "x$mysql_found" = "xyes" -- then -- LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB" -- MYSQL_LIB="$dir/libmysqlclient.a $LIBZ_LIB" -- AC_SUBST(MYSQL_LIB) -- AC_CHECK_LIB(mysqlclient, mysql_real_connect, -- mysql_ok=yes, mysql_ok=no) -- fi -- fi -- done -- -- if test "x$mysql_ok" != "xyes" -- then -- AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib']) -- fi -+ # dependencies are guaranteed to ensure we have mysql_config -+ # available, and it is a much cleaner way of discovering what -+ # must be linked against libmysqlclient, that transparently -+ # covers USE="ssl" and other issues. -+ # Robert Coie <rac@gentoo.org> 2003.03.04 -+ -+ mysql_ok=yes -+ MYSQL_LIB=`mysql_config --libs` -+ LIBS="${LIBS} ${MYSQL_LIB}" - ]) - - diff --git a/dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch b/dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch new file mode 100644 index 000000000000..f3fb35acefee --- /dev/null +++ b/dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch @@ -0,0 +1,14 @@ +--- shared/src/CMySQL.cpp.orig Thu Aug 5 12:26:14 2004 ++++ shared/src/CMySQL.cpp Thu Aug 5 12:29:53 2004 +@@ -451,7 +451,11 @@ + if (!isConnected()) + return false; + ++#if ( MYSQL_VERSION_ID >= 40103 ) ++ if (mysql_shutdown(mysql,SHUTDOWN_DEFAULT) != 0) ++#else + if (mysql_shutdown(mysql) != 0) ++#endif + { + if (emiterror) + emitError(); |