[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-12-gaa6c87b



The following commit has been merged in the master branch:
commit e34c2b03f4d4ef1dd08b9993ec93865192d5316e
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 15 00:21:55 2012 +0200

    actually keep opening libmysqlclient_r

diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 1b457c7..4b9e744 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -15,7 +15,7 @@ index 9d9a8ad..b8cccf7 100644
  +              $(LIB1TARGET)
  +DEFLIB1NAME=$(TARGET)
  +
-++CFLAGS += -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient.so.[0-9][0-9]\).*,\\1,")\"
+++CFLAGS += -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e s/mysqlclient/mysqlclient_r/ | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient_r.so.[0-9][0-9]\).*,\\1,")\"
 ++
  +# --- Targets ------------------------------------------------------
  +

-- 
LibreOffice packaging repository


Reply to: