commit 70283f48c555a5411c8e9cd7d045e2f93f80310a
Author: Jan Rękorajski <[email protected]>
Date: Sun May 10 01:06:48 2015 +0200
- fix building on x32
- rel 3
pxlib-libx32.patch | 28 ++++++++++++++++++++++++++++
pxlib.spec | 6 +++++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/pxlib.spec b/pxlib.spec
index fa3c5ea..630df67 100644
--- a/pxlib.spec
+++ b/pxlib.spec
@@ -6,7 +6,7 @@ Summary: A library to read Paradox DB files
Summary(pl.UTF-8): Biblioteka do odczytu plików baz danych Paradox DB
Name: pxlib
Version: 0.6.3
-Release: 2
+Release: 3
Epoch: 0
License: GPL v2
Group: Libraries
@@ -14,6 +14,7 @@ Source0:
http://dl.sourceforge.net/pxlib/%{name}-%{version}.tar.gz
# Source0-md5: 0742020854496fa757d7acbe6a895224
Patch0: %{name}-stderr.patch
Patch1: %{name}-lib64.patch
+Patch2: %{name}-libx32.patch
URL: http://pxlib.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -69,6 +70,9 @@ Statyczna biblioteka pxlib.
%if "%{_lib}" == "lib64"
%patch1 -p1
%endif
+%if "%{_lib}" == "libx32"
+%patch2 -p1
+%endif
%build
cp -f /usr/share/gettext/config.rpath .
diff --git a/pxlib-libx32.patch b/pxlib-libx32.patch
new file mode 100644
index 0000000..06b2dc5
--- /dev/null
+++ b/pxlib-libx32.patch
@@ -0,0 +1,28 @@
+--- pxlib-0.6.3/configure.in.orig 2007-12-22 23:23:19.000000000 +0000
++++ pxlib-0.6.3/configure.in 2007-12-22 23:27:33.000000000 +0000
+@@ -85,7 +85,7 @@
+ if test "$am_cv_func_iconv" != "yes" ; then
+ AC_ARG_WITH(recode, [ --with-recode=DIR Path to recode library
(/usr)])
+ if test -r ${withval}/include/recode.h ; then
+- RECODE_LIBDIR=-L${withval}/lib
++ RECODE_LIBDIR=-L${withval}/libx32
+ RECODE_INCLUDEDIR=-I${withval}/include
+ else
+ RECODE_LIBDIR=-L/usr
+@@ -116,13 +116,13 @@
+ PX_HAVE_GSF=0
+ else
+ if test -r ${withval}/include/libgsf-1/gsf/gsf-input.h ; then
+- GSF_LIBDIR=-L${withval}/lib
+- GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include"
++ GSF_LIBDIR=-L${withval}/libx32
++ GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/libx32/glib-2.0/include"
+ try_gsf=true
+ else
+ if test -r /usr/include/libgsf-1/gsf/gsf-input.h ; then
+ GSF_LIBDIR=-L/usr
+- GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
++ GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/libx32/glib-2.0/include"
+ try_gsf=true
+ else
+ try_gsf=false
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pxlib.git/commitdiff/70283f48c555a5411c8e9cd7d045e2f93f80310a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
