commit 7863a1fb1285db3b7d22141d7164c82f473e18c2
Author: Jakub Bogusz <[email protected]>
Date: Tue Dec 9 21:52:48 2014 +0100
- added libdir patch (sanitize install dir stored in libffi.la on multilib
archs)
- release 2
libffi-libdir.patch | 11 +++++++++++
libffi.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/libffi.spec b/libffi.spec
index af380c2..c244b7b 100644
--- a/libffi.spec
+++ b/libffi.spec
@@ -6,13 +6,14 @@ Summary: Foreign Function Interface library
Summary(pl.UTF-8): Biblioteka Foreign Function Interface
Name: libffi
Version: 3.2.1
-Release: 1
+Release: 2
Epoch: 7
License: MIT-like
Group: Libraries
Source0: ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
# Source0-md5: 83b89587607e3eb65c70d361f13bab43
Patch0: %{name}-info.patch
+Patch1: %{name}-libdir.patch
URL: http://sources.redhat.com/libffi/
BuildRequires: autoconf >= 2.68
BuildRequires: automake
@@ -74,6 +75,7 @@ Statyczna wersja biblioteki libffi.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/libffi-libdir.patch b/libffi-libdir.patch
new file mode 100644
index 0000000..64932d8
--- /dev/null
+++ b/libffi-libdir.patch
@@ -0,0 +1,11 @@
+--- libffi-3.2.1/configure.ac.orig 2014-11-12 12:56:51.000000000 +0100
++++ libffi-3.2.1/configure.ac 2014-12-09 19:45:15.750254077 +0100
+@@ -604,7 +604,7 @@
+ multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
++ ../*) toolexeclibdir=$(dirname $toolexeclibdir)/${multi_os_directory#../}
;;
+ esac
+ AC_SUBST(toolexecdir)
+ else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libffi.git/commitdiff/7863a1fb1285db3b7d22141d7164c82f473e18c2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
