[packages/libffi] - drop libdir hackery in favor of just using a configure option

baggins baggins at pld-linux.org
Fri Mar 27 23:27:31 CET 2020


commit 75e45e00147927c5eb6955a542115f16db03b65d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 27 23:26:49 2020 +0100

    - drop libdir hackery in favor of just using a configure option

 libffi-libdir.patch | 11 -----------
 libffi.spec         |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)
---
diff --git a/libffi.spec b/libffi.spec
index 6200fff..f8176c5 100644
--- a/libffi.spec
+++ b/libffi.spec
@@ -13,7 +13,6 @@ Group:		Libraries
 Source0:	ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
 # Source0-md5:	6313289e32f1d38a9df4770b014a2ca7
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-libdir.patch
 URL:		http://www.sourceware.org/libffi/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
@@ -76,7 +75,6 @@ Statyczna wersja biblioteki libffi.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -85,6 +83,7 @@ Statyczna wersja biblioteki libffi.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-multi-os-directory \
 	%{!?with_static_libs:--disable-static}
 
 %{__make}
diff --git a/libffi-libdir.patch b/libffi-libdir.patch
deleted file mode 100644
index 6a3f21c..0000000
--- a/libffi-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libffi-3.3/configure.ac.orig	2020-02-09 08:12:33.621725550 +0100
-+++ libffi-3.3/configure.ac	2020-02-09 08:14:51.227646741 +0100
-@@ -367,7 +367,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
-   fi
-   AC_SUBST(toolexecdir)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libffi.git/commitdiff/75e45e00147927c5eb6955a542115f16db03b65d



More information about the pld-cvs-commit mailing list