[mingw-libffi] Added missing patch

epienbro epienbro at fedoraproject.org
Sat Mar 10 17:21:02 UTC 2012


commit a837682d032cce13781da520fa5481305c0205a6
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Mar 10 18:20:54 2012 +0100

    Added missing patch

 libffi-mingw-w64-compatibility.patch |   11 +++++++++++
 mingw-libffi.spec                    |    6 +++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/libffi-mingw-w64-compatibility.patch b/libffi-mingw-w64-compatibility.patch
new file mode 100644
index 0000000..91dd805
--- /dev/null
+++ b/libffi-mingw-w64-compatibility.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2011-07-04 22:01:33.336825129 +0200
++++ Makefile.in	2011-07-04 22:01:40.341715414 +0200
+@@ -118,7 +118,7 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" \
+ 	"$(DESTDIR)$(pkgconfigdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+-libffi_la_LIBADD =
++libffi_la_LIBADD = -no-undefined
+ am__dirstamp = $(am__leading_dot)dirstamp
+ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \
+ 	src/java_raw_api.lo src/closures.lo
diff --git a/mingw-libffi.spec b/mingw-libffi.spec
index 265f2b9..0640bf5 100644
--- a/mingw-libffi.spec
+++ b/mingw-libffi.spec
@@ -14,6 +14,9 @@ License:	BSD
 URL:		http://sourceware.org/libffi
 Source0:	ftp://sourceware.org/pub/libffi/libffi-%{version}-%{rc_version}.tar.gz
 
+# Needed to build against mingw-w64
+Patch0:         libffi-mingw-w64-compatibility.patch
+
 BuildArch:	noarch
 
 BuildRequires:	mingw32-filesystem >= 95
@@ -49,6 +52,7 @@ Foreign function interface library for MinGW.
 
 %prep
 %setup -q -n libffi-%{version}-%{rc_version}
+%patch0 -p0
 
 
 %build
@@ -80,7 +84,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw64_bindir}/libffi-6.dll
 %{mingw64_libdir}/libffi.dll.a
 %{mingw64_libdir}/pkgconfig/*.pc
-%{mingw64_libdir}/libffi-%{version}
+%{mingw64_libdir}/libffi-%{version}-%{rc_version}
 
 
 %changelog


More information about the scm-commits mailing list