commit 17938b0c55b9cbb86502381f5cce1a3501986ccb
Author: Jan Rękorajski <[email protected]>
Date: Thu Aug 27 09:47:32 2015 +0200
- fix build on x32
php-pecl-wbxml.spec | 2 ++
x32.patch | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
---
diff --git a/php-pecl-wbxml.spec b/php-pecl-wbxml.spec
index 7185a63..df700a6 100644
--- a/php-pecl-wbxml.spec
+++ b/php-pecl-wbxml.spec
@@ -17,6 +17,7 @@ Source0:
http://pecl.php.net/get/%{modname}-%{version}.tgz
Patch0:
wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff
Patch1: wbxml-1.0.3-expat_fix.diff
Patch2: libwbxml.patch
+Patch3: x32.patch
URL: http://pecl.php.net/package/wbxml/
BuildRequires: %{php_name}-devel >= 4:5.0.4
BuildRequires: libwbxml-devel
@@ -44,6 +45,7 @@ mv %{modname}-%{version}/* .
%patch0 -p0
%patch1 -p0
%patch2 -p1
+%patch3 -p1
%build
export CFLAGS="%{rpmcflags} `pkg-config --cflags libwbxml2`"
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..01bbe3a
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,20 @@
+--- php55-pecl-wbxml-1.0.3/config.m4~ 2009-02-22 12:30:57.000000000 +0100
++++ php55-pecl-wbxml-1.0.3/config.m4 2015-08-27 09:43:55.951434326 +0200
+@@ -24,7 +24,7 @@
+
+ AC_MSG_CHECKING([for the location of libwbxml2])
+ for i in $PHP_WBXML /usr/local /usr; do
+- for j in $PHP_LIBDIR lib64 lib; do
++ for j in $PHP_LIBDIR lib64 libx32 lib; do
+ if test -f $i/$j/libwbxml2.$SHLIB_SUFFIX_NAME; then
+ WBXML_DIR=$i
+ WBXML_LIBDIR=$i/$j
+@@ -46,7 +46,7 @@
+ PHP_ADD_INCLUDE($WBXML_DIR/include)
+
+ for i in $PHP_LIBEXPAT_DIR /usr/local /usr; do
+- for j in $PHP_LIBDIR lib64 lib; do
++ for j in $PHP_LIBDIR lib64 libx32 lib; do
+ if test -f $i/$j/libexpat.$SHLIB_SUFFIX_NAME; then
+ EXPAT_DIR=$i
+ EXPAT_LIBDIR=$i/$j
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-wbxml.git/commitdiff/17938b0c55b9cbb86502381f5cce1a3501986ccb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
