Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files/2.3.0: system-check-db-4.6.patch
Date: Thu, 20 Sep 2007 11:52:36
Message-Id: E1IYKSI-0005oc-U3@stork.gentoo.org
1 suka 07/09/20 11:44:26
2
3 Added: system-check-db-4.6.patch
4 Log:
5 Add missing patch, oops, closes bug #193162
6 (Portage version: 2.1.3.9)
7
8 Revision Changes Path
9 1.1 app-office/openoffice/files/2.3.0/system-check-db-4.6.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/system-check-db-4.6.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/system-check-db-4.6.patch?rev=1.1&content-type=text/plain
13
14 Index: system-check-db-4.6.patch
15 ===================================================================
16 --- patches/src680/system-db-check.diff.orig 2007-09-08 16:25:25.000000000 +0200
17 +++ patches/src680/system-db-check.diff 2007-09-08 16:26:25.000000000 +0200
18 @@ -12,7 +12,7 @@
19 - [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
20 - ], []
21 - )
22 -+ for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
23 ++ for dbver in -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
24 + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
25 + done
26 + if test "$DB_INCLUDES" = ""; then
27 @@ -31,7 +31,7 @@
28 - AC_HAVE_LIBRARY(db, [],
29 - [AC_MSG_ERROR([db not installed or functional])], [])
30 + save_LIBS="$LIBS"
31 -+ for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
32 ++ for dbver in -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
33 + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
34 + done
35 + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
36
37
38
39 --
40 gentoo-commits@g.o mailing list