From 4c18369350da53b51b88c581cc08cb046f46986d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 17 Jul 2014 14:36:48 -0400 Subject: [PATCH 1/3] fix license handling --- libffi.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libffi.spec b/libffi.spec index fa91abe..42bf303 100644 --- a/libffi.spec +++ b/libffi.spec @@ -2,7 +2,7 @@ Name: libffi Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A portable foreign function interface library Group: System Environment/Libraries @@ -107,7 +107,9 @@ fi %files -%doc LICENSE README +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc README %{_libdir}/*.so.* %files devel @@ -118,6 +120,9 @@ fi %{_infodir}/libffi.info.gz %changelog +* Thu Jul 17 2014 Tom Callaway - 3.1-5 +- fix license handling + * Sun Jun 29 2014 Anthony Green - 3.1-4 - fix exec stack problem on 32-bit build From 0936745d51fc2c3a1ab8f3f6e61ff164e5f128fb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:16:34 +0000 Subject: [PATCH 2/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libffi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffi.spec b/libffi.spec index 42bf303..a9f8a2c 100644 --- a/libffi.spec +++ b/libffi.spec @@ -2,7 +2,7 @@ Name: libffi Version: 3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A portable foreign function interface library Group: System Environment/Libraries @@ -120,6 +120,9 @@ fi %{_infodir}/libffi.info.gz %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 17 2014 Tom Callaway - 3.1-5 - fix license handling From 4d6c708a331c532913723185ccaebe5541c3b1be Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 15 Jan 2015 02:37:57 +0000 Subject: [PATCH 3/3] Add patch to fix issues on aarch64 (rhbz 1174037) --- libffi-aarch64-rhbz1174037.patch | 11 +++++++++++ libffi.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libffi-aarch64-rhbz1174037.patch diff --git a/libffi-aarch64-rhbz1174037.patch b/libffi-aarch64-rhbz1174037.patch new file mode 100644 index 0000000..dbf6308 --- /dev/null +++ b/libffi-aarch64-rhbz1174037.patch @@ -0,0 +1,11 @@ +--- libffi-3.1/src/aarch64/ffi.c.orig 2014-04-25 18:45:13.000000000 +0100 ++++ libffi-3.1/src/aarch64/ffi.c 2015-01-15 02:36:56.314906455 +0000 +@@ -728,7 +728,7 @@ + state.ngrn = N_X_ARG_REG; + + memcpy (allocate_to_stack (&state, stack, ty->alignment, +- ty->size), ecif->avalue + i, ty->size); ++ ty->size), ecif->avalue[i], ty->size); + } + break; + diff --git a/libffi.spec b/libffi.spec index a9f8a2c..b2df579 100644 --- a/libffi.spec +++ b/libffi.spec @@ -2,7 +2,7 @@ Name: libffi Version: 3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A portable foreign function interface library Group: System Environment/Libraries @@ -13,6 +13,7 @@ Source1: ffi-multilib.h Source2: ffitarget-multilib.h Patch0: libffi-3.1-fix-include-path.patch Patch1: libffi-3.1-fix-exec-stack.patch +Patch2: libffi-aarch64-rhbz1174037.patch %description Compilers for high level languages generate code that follow certain @@ -59,6 +60,7 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .fixpath %patch1 -p1 -b .execstack +%patch2 -p1 -b .aarch64 %build @@ -120,6 +122,9 @@ fi %{_infodir}/libffi.info.gz %changelog +* Thu Jan 15 2015 Peter Robinson 3.1-7 +- Add patch to fix issues on aarch64 (rhbz 1174037) + * Sun Aug 17 2014 Fedora Release Engineering - 3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild