[packages/db5.3: 1/2] - added link patch (fixes libdb-sql linking) - added sql-features patch (adds SQLITE_ENABLE_COLUMN_M
qboosh
qboosh at pld-linux.org
Sun Jun 9 11:00:36 CEST 2013
commit 21bea13e6072213cca4f8e0634aa97658243c23a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 9 07:18:25 2013 +0200
- added link patch (fixes libdb-sql linking)
- added sql-features patch (adds SQLITE_ENABLE_COLUMN_METADATA needed by libgda)
db5.3-link.patch | 11 +++++++++++
db5.3-sql-features.patch | 11 +++++++++++
db5.3.spec | 8 ++++++--
3 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/db5.3.spec b/db5.3.spec
index c04f920..32563e0 100644
--- a/db5.3.spec
+++ b/db5.3.spec
@@ -23,6 +23,8 @@ Group: Libraries
#Source0Download: http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
Source0: http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
# Source0-md5: 3fda0b004acdaa6fa350bfc41a3b95ca
+Patch0: %{name}-link.patch
+Patch1: %{name}-sql-features.patch
URL: http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
BuildRequires: automake
%if %{with java}
@@ -245,7 +247,7 @@ Pliki programistyczne biblioteki db-tcl.
Summary: SQL layer for Berkeley database library
Summary(pl.UTF-8): Wartstwa SQL dla biblioteki baz danych Berkeley
Group: Libraries
-%if %{with default_bd}
+%if %{with default_db}
Provides: db-sql = %{version}-%{release}
%endif
@@ -260,7 +262,7 @@ Summary: Development files for db-sql library
Summary(pl.UTF-8): Pliki programistyczne biblioteki db-sql
Group: Development/Libraries
Requires: %{name}-sql = %{version}-%{release}
-%if %{with default_bd}
+%if %{with default_db}
Provides: db-sql-devel = %{version}-%{release}
Obsoletes: db-sql-devel
%endif
@@ -368,6 +370,8 @@ poleceń.
%prep
%setup -q -n db-%{ver}
+%patch0 -p1
+%patch1 -p1
%build
cp -f /usr/share/automake/config.sub dist
diff --git a/db5.3-link.patch b/db5.3-link.patch
new file mode 100644
index 0000000..a205476
--- /dev/null
+++ b/db5.3-link.patch
@@ -0,0 +1,11 @@
+--- db-5.2.42/dist/Makefile.in.orig 2013-06-09 07:40:47.715060826 +0200
++++ db-5.2.42/dist/Makefile.in 2013-06-09 08:06:06.361695837 +0200
+@@ -882,7 +882,7 @@
+
+ # Shared SQL library.
+ $(libsqlso_target): $(SQL_OBJS)
+- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS)
++ $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS) -ldl
+ $(RM) $(libsql)
+ $(LN) -s .libs/$(libsql_version) $(libsql)
+
diff --git a/db5.3-sql-features.patch b/db5.3-sql-features.patch
new file mode 100644
index 0000000..1c52b89
--- /dev/null
+++ b/db5.3-sql-features.patch
@@ -0,0 +1,11 @@
+--- db-5.3.21/dist/Makefile.in.orig 2012-05-11 19:57:48.000000000 +0200
++++ db-5.3.21/dist/Makefile.in 2013-06-09 10:32:16.358179710 +0200
+@@ -106,7 +106,7 @@
+ # SQL support is optional, and can be built with static or shared libraries.
+ ##################################################
+ SQLFLAGS= -I$(builddir) -I$(builddir)/sql -I$(langdir)/sql/generated \
+- -D_HAVE_SQLITE_CONFIG_H @SQL_FLAGS@
++ -D_HAVE_SQLITE_CONFIG_H @SQL_FLAGS@ -DSQLITE_ENABLE_COLUMN_METADATA=1
+
+ libsql_base= libdb_sql
+ libsql= $(libsql_base).a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/db5.3.git/commitdiff/3daef40846568b8eba5aaf35c73965af9e5bcd11
More information about the pld-cvs-commit
mailing list