commit 8d4d4aee1d47657de2eb130770ed8705739f1e94
Author: Jan Rękorajski <[email protected]>
Date: Mon Dec 21 19:40:20 2015 +0100
- fix lib dir confusion on x32
- rel 23
libgda.spec | 5 ++++-
x32.patch | 16 ++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/libgda.spec b/libgda.spec
index cabe634..29709ca 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -20,7 +20,7 @@ Summary: GNU Data Access library
Summary(pl.UTF-8): Biblioteka GNU Data Access
Name: libgda
Version: 1.2.4
-Release: 22
+Release: 23
Epoch: 1
License: LGPL v2+/GPL v2+
Group: Applications/Databases
@@ -39,6 +39,7 @@ Patch9: glib.patch
Patch10: %{name}-xml.patch
Patch11: %{name}-format.patch
Patch12: %{name}-mdb-0.7.patch
+Patch13: x32.patch
URL: http://www.gnome-db.org/
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.59
@@ -308,6 +309,7 @@ Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro)
dla GDA.
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
%build
CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
@@ -317,6 +319,7 @@ CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
%{__autoconf}
%{__automake}
%configure \
+ __lib=%{_lib} \
--enable-gtk-doc \
--with-html-dir=%{_gtkdocdir} \
--with-firebird%{!?with_firebird:=no} \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..ce09cff
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,16 @@
+--- libgda-1.2.4/configure.in~ 2015-12-21 19:35:22.000000000 +0100
++++ libgda-1.2.4/configure.in 2015-12-21 19:37:57.337256019 +0100
+@@ -105,10 +105,13 @@
+
+ dnl Test for lib64 architectures
+ dnl FIXME: should really check target
++lib=$__lib
++if [ -z "$lib" ]; then
+ case $host_cpu in
+ x86_64* | sparc64*) lib="lib64";;
+ *) lib="lib";;
+ esac
++fi
+
+ dnl Test for Berkeley DB
+ try_bdb=true
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda.git/commitdiff/8d4d4aee1d47657de2eb130770ed8705739f1e94
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
