rpms/mingw-libffi
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop libffi-3.1-fix-include-path.patch, it just breaks the pkgconfig file

Browse Source
This commit is contained in:
Sandro Mani 2020-02-12 18:15:38 +01:00
parent 0b0792c32d
commit 17cb667230
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libffi-3.1-fix-include-path.patch
View File

@ -1,17 +0,0 @@
diff -up libffi-3.1/libffi.pc.in.fixpath libffi-3.1/libffi.pc.in
--- libffi-3.1/libffi.pc.in.fixpath 2014-04-25 19:45:13.000000000 +0200
+++ libffi-3.1/libffi.pc.in 2014-06-12 12:06:06.000000000 +0200
@@ -1,11 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces
Version: @PACKAGE_VERSION@
-Libs: -L${toolexeclibdir} -lffi
+Libs: -L${libdir} -lffi
Cflags: -I${includedir}

18
mingw-libffi.spec
View File

@ -2,17 +2,16 @@
Name: mingw-libffi
Version: 3.1
Release: 8%{?dist}
Release: 9%{?dist}
Summary: A portable foreign function interface library for MinGW
License: BSD
URL: http://sourceware.org/libffi
Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
Patch0: libffi-3.1-fix-include-path.patch
Patch1: libffi-3.1-fix-exec-stack.patch
Patch2: libffi-aarch64-rhbz1174037.patch
Patch3: libffi-3.1-aarch64-fix-exec-stack.patch
Patch0: libffi-3.1-fix-exec-stack.patch
Patch1: libffi-aarch64-rhbz1174037.patch
Patch2: libffi-3.1-aarch64-fix-exec-stack.patch
BuildArch: noarch
@ -63,11 +62,7 @@ Foreign function interface static library for MinGW.
%prep
%setup -q -n libffi-%{version}
%patch0 -p1 -b .fixpath
%patch1 -p1 -b .execstack
%patch2 -p1 -b .aarch64
%patch3 -p1 -b .aarch64execstack
%autosetup -p1 -n libffi-%{version}
%build
%mingw_configure --enable-shared
@ -110,6 +105,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
* Wed Feb 12 2020 Sandro Mani <manisandro@gmail.com> - 3.1-9
- Drop libffi-3.1-fix-include-path.patch, it just breaks the pkgconfig file
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild