[ooo-build-commit] 2 commits - patches/dev300

René Engelhard rene at kemper.freedesktop.org
Wed Sep 16 07:01:35 PDT 2009


 patches/dev300/apply                                         |    2 +-
 patches/dev300/debian-mysqlc-build-against-stlport-hack.diff |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a9e3931df119dc571d61a103e0be11a39177f445
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 16 16:00:35 2009 +0200

    adapt debian-mysqlc-build-against-stlport-hack.diff

diff --git a/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff b/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
index 2cd5297..54d9453 100644
--- a/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
+++ b/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
@@ -13,9 +13,9 @@ Index: mysqlc/source/makefile.mk
 +.ENDIF
  .ELSE
 +.IF "$(USE_SYSTEM_STL)" != "YES"
-+CDEFS += -DCPPCONN_LIB=\"libmysqlcppconn-stlport.so.3\"
++CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn-stlport.so)\"
 +.ELSE
- CDEFS += -DCPPCONN_LIB=\"libmysqlcppconn.so.3\"
+ CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
  .ENDIF
 +.ENDIF
  
commit ccae97ad23d55c9df1956d4e04e16f951f8857d8
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 16 15:57:46 2009 +0200

    fix typo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a6ba9d3..d34c2b6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3357,7 +3357,7 @@ offapi-layoutcode.diff, cocofan
 xmloff-layoutcode.diff, cocofan
 
 [ MySQL ]
-cws-mysqlnative-200900916.diff
+cws-mysqlnative-20090916.diff
 
 [ MySQL and DebianBaseOnly ]
 # add hack to link against STLport version of libmysqlcppconn on i386.


More information about the ooo-build-commit mailing list