[packages/afflib] - multilib buildfixes
adamg
adamg at pld-linux.org
Thu Nov 15 08:11:26 CET 2018
commit b5abd9fc97c49f88d0e3bb83884984d829490a33
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Thu Nov 15 08:11:20 2018 +0100
- multilib buildfixes
afflib-x32-x64.patch | 18 ++++++++++++++++++
afflib.spec | 2 ++
2 files changed, 20 insertions(+)
---
diff --git a/afflib.spec b/afflib.spec
index 8cda61f..aa5ce52 100644
--- a/afflib.spec
+++ b/afflib.spec
@@ -19,6 +19,7 @@ Group: Libraries
Source0: https://github.com/sshock/AFFLIBv3/archive/v%{version}.tar.gz
# Source0-md5: dbc856c84df06d3a5ea74b98f1b1a40b
Patch0: Sanity-check-size-passed-to-malloc.patch
+Patch1: %{name}-x32-x64.patch
URL: https://github.com/sshock/AFFLIBv3
BuildRequires: autoconf
BuildRequires: automake
@@ -91,6 +92,7 @@ currently complete.
%prep:
%setup -q -n AFFLIBv3-%{version}
%patch0 -p1
+%patch1 -p1
%if %{with system_lzma}
# prevent internal lzma to be built - testing
diff --git a/afflib-x32-x64.patch b/afflib-x32-x64.patch
new file mode 100644
index 0000000..e6f8617
--- /dev/null
+++ b/afflib-x32-x64.patch
@@ -0,0 +1,18 @@
+--- AFFLIBv3-3.7.17/configure.ac~ 2018-09-09 19:44:29.000000000 +0200
++++ AFFLIBv3-3.7.17/configure.ac 2018-11-15 08:01:41.847431009 +0100
+@@ -37,9 +37,13 @@
+ AC_MSG_NOTICE([checking ${spfx}/include])
+ if test -d ${spfx}/include; then
+ CPPFLAGS="$CPPFLAGS -I${spfx}/include"
+- LDFLAGS="$LDFLAGS -L${spfx}/lib"
+ AC_MSG_NOTICE([ *** ADDING ${spfx}/include to CPPFLAGS *** ])
+- AC_MSG_NOTICE([ *** ADDING ${spfx}/lib to LDFLAGS *** ])
++ for lib in libx32 lib64 lib; do
++ if test -d ${spfx}/${lib}; then
++ LDFLAGS="$LDFLAGS -L${spfx}/${lib}"
++ AC_MSG_NOTICE([ *** ADDING ${spfx}/${lib} to LDFLAGS *** ])
++ fi
++ done
+ fi
+ done
+ AC_MSG_NOTICE([ CPPFLAGS = ${CPPFLAGS} ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/afflib.git/commitdiff/b5abd9fc97c49f88d0e3bb83884984d829490a33
More information about the pld-cvs-commit
mailing list