cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly find and load libdb.

Browse Source
This commit is contained in:
ajacoutot 2012-01-25 11:30:41 +00:00
parent 97585da225
commit eba9d62d75
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/libgda/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2011/12/05 12:32:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.57 2012/01/25 11:30:41 ajacoutot Exp $
SHARED_ONLY= Yes
@ -21,7 +21,7 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION}
PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
PKGNAME-ui= libgda-ui-${GNOME_VERSION}
REVISION-main= 0
REVISION-main= 1
REVISION-ui= 0
EPOCH-main= 2
@ -157,4 +157,10 @@ LIB_DEPENDS-ldap= x11/gnome/libgda \
databases/openldap
CONFIGURE_ARGS+= --with-ldap
# XXX sync LIBdb_VERSION with databases/db/v4
LIBdb_VERSION= 5.0
SUBST_VARS+= LIBdb_VERSION
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
.include <bsd.port.mk>

37
x11/gnome/libgda/patches/patch-configure
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.23 2011/11/21 07:38:23 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.24 2012/01/25 11:30:41 ajacoutot Exp $
- Don't do bash pattern substitutions.
Don't do bash pattern substitutions.
- Stupid configure is stupid, just work around the mess by setting
the values we know are correct.
Our libdb does not follow upstream naming (libdb.so.XX versus
libdb-5.0.so).
--- configure.orig Sun Nov 20 15:26:59 2011
+++ configure Mon Nov 21 08:00:00 2011
+++ configure Wed Jan 25 12:09:40 2012
@@ -20173,9 +20173,9 @@ $as_echo_n "checking if gobject-introspection is corre
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
@ -19,17 +19,16 @@ $OpenBSD: patch-configure,v 1.23 2011/11/21 07:38:23 ajacoutot Exp $
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=$introspection_makefile
@@ -21100,6 +21100,13 @@ $as_echo "$as_me: BDB backend not used" >&6;}
bdb_found=yes
fi
fi
+
+# XXX
+bdb_found=yes
+BDB_CFLAGS=-I${bdbdir}/include/db4
+BDB_LIBS="-L${bdbdir}/lib -ldb"
+BDB_LIB="-ldb"
+BDB_DIR="$bdbdir"
if test "$bdb_found" = "yes"; then
BDB_TRUE=
@@ -21023,9 +21023,9 @@ $as_echo_n "checking for Berkeley DB files in $d... "
db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
try_headers="db.h db$version/db.h db$sversion/db.h"
else
- db_libfilename="libdb-$version$bdb_libext"
- db_lib="-ldb-$version"
- db_libfile="$d/$bdb_loclibdir/libdb-$version$bdb_libext"
+ db_libfilename="libdb$bdb_libext.${LIBdb_VERSION}"
+ db_lib="-ldb"
+ db_libfile="$d/$bdb_loclibdir/libdb$bdb_libext.${LIBdb_VERSION}"
try_headers="db.h db$version/db.h db$sversion/db.h"
fi
fi