/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Aug 31 14:08:52 2012 UTC (2 years ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump to 3.6.1. Drop older. Stabilise 3.5.6 on amd64 x86 and ppc. Remove live 3.5 branch ebuild.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

1 From 130a064c29f218699c0b64b50367b3ddd3a3d2db Mon Sep 17 00:00:00 2001
2 From: Tomas Chvatal <tchvatal@suse.cz>
3 Date: Wed, 08 Aug 2012 19:10:17 +0000
4 Subject: Use LIBS not LDFLAGS to not fail with enforced as-needed.
5
6 Change-Id: Ia27e97c12e9a8f36e106c9ae3c399cd776433387
7 (cherry picked from commit 0c7617a388d8e2e3a0d6c451b6412a5d32dd3d6e)
8
9 Signed-off-by: Michael Stahl <mstahl@redhat.com>
10 ---
11 diff --git a/configure.in b/configure.in
12 index 2dd9390..444cf82 100644
13 --- a/configure.in
14 +++ b/configure.in
15 @@ -6833,8 +6833,8 @@ if test "$ENABLE_MYSQLC" = "YES"; then
16 [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
17 AC_CHECK_LIB([mysqlcppconn], [main], [:],
18 [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
19 - save_LDFLAGS=$LDFLAGS
20 - LDFLAGS="$LDFLAGS -lmysqlcppconn"
21 + save_LIBS=$LIBS
22 + LIBS="$LIBS -lmysqlcppconn"
23 AC_MSG_CHECKING([version])
24 AC_RUN_IFELSE([AC_LANG_SOURCE([[
25 #include <mysql_driver.h>
26 @@ -6852,7 +6852,7 @@ int main(int argc, char **argv) {
27 ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[])
28
29 AC_LANG_POP([C++])
30 - LDFLAGS=$save_LDFLAGS
31 + LIBS=$save_LIBS
32 else
33 AC_MSG_RESULT([internal])
34 AC_MSG_CHECKING([for mysqlcppconn module])
35 --
36 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20