Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
1ef6a4f7a5 | ||
|
|
038985d7cc |
16 changed files with 220 additions and 213 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -3,10 +3,3 @@ libffi-3.0.9.tar.gz
|
|||
/libffi-3.0.11.tar.gz
|
||||
/libffi-3.0.13.tar.gz
|
||||
/libffi-3.1.tar.gz
|
||||
/libffi-3.4.2.tar.gz
|
||||
/libffi-3.4.4.tar.gz
|
||||
/libffi-3.4.6.tar.gz
|
||||
/libffi-3.4.7.tar.gz
|
||||
/libffi-3.4.8.tar.gz
|
||||
/libffi-3.5.1.tar.gz
|
||||
/libffi-3.5.2.tar.gz
|
||||
|
|
|
|||
11
libffi-3.1-aarch64-fix-exec-stack.patch
Normal file
11
libffi-3.1-aarch64-fix-exec-stack.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/src/aarch64/sysv.S
|
||||
+++ b/src/aarch64/sysv.S
|
||||
@@ -396,3 +396,8 @@
|
||||
#ifdef __ELF__
|
||||
.size CNAME(ffi_closure_SYSV), .-CNAME(ffi_closure_SYSV)
|
||||
#endif
|
||||
+
|
||||
+#if defined __ELF__ && defined __linux__
|
||||
+ .section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
31
libffi-3.1-fix-exec-stack.patch
Normal file
31
libffi-3.1-fix-exec-stack.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Suominen <ssuominen@gentoo.org>
|
||||
Date: Sat, 31 May 2014 08:53:10 -0400
|
||||
Subject: [PATCH] Add missing GNU stack markings in win32.S
|
||||
|
||||
---
|
||||
src/x86/win32.S | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/x86/win32.S b/src/x86/win32.S
|
||||
index daf0e79..e42baf2 100644
|
||||
--- a/src/x86/win32.S
|
||||
+++ b/src/x86/win32.S
|
||||
@@ -1,5 +1,6 @@
|
||||
/* -----------------------------------------------------------------------
|
||||
- win32.S - Copyright (c) 1996, 1998, 2001, 2002, 2009 Red Hat, Inc.
|
||||
+ win32.S - Copyright (c) 2014 Anthony Green
|
||||
+ Copyright (c) 1996, 1998, 2001, 2002, 2009 Red Hat, Inc.
|
||||
Copyright (c) 2001 John Beniton
|
||||
Copyright (c) 2002 Ranjit Mathew
|
||||
Copyright (c) 2009 Daniel Witte
|
||||
@@ -1304,3 +1305,6 @@ L_ffi_closure_SYSV_inner$stub:
|
||||
|
||||
#endif /* !_MSC_VER */
|
||||
|
||||
+#if defined __ELF__ && defined __linux__
|
||||
+ .section .note.GNU-stack,"",@progbits
|
||||
+#endif
|
||||
--
|
||||
1.9.3
|
||||
|
||||
17
libffi-3.1-fix-include-path.patch
Normal file
17
libffi-3.1-fix-include-path.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
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}
|
||||
17
libffi-3.1-libffi_tmpdir.patch
Normal file
17
libffi-3.1-libffi_tmpdir.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Most temp file directories need to be hardened against execution, but
|
||||
libffi needs execute privileges. Add a libffi-specific temp directory
|
||||
that can be set up by sysadmins as needed with suitable permissions.
|
||||
This both ensures that libffi will have a valid temp directory to use
|
||||
as well as preventing attempts to access other directories.
|
||||
|
||||
diff -rup a/src/closures.c b/src/closures.c
|
||||
--- a/src/closures.c 2014-05-11 09:54:19.000000000 -0400
|
||||
+++ b/src/closures.c 2020-04-29 20:50:00.454853909 -0400
|
||||
@@ -362,6 +362,7 @@ static struct
|
||||
const char *arg;
|
||||
int repeat;
|
||||
} open_temp_exec_file_opts[] = {
|
||||
+ { open_temp_exec_file_env, "LIBFFI_TMPDIR", 0 },
|
||||
{ open_temp_exec_file_env, "TMPDIR", 0 },
|
||||
{ open_temp_exec_file_dir, "/tmp", 0 },
|
||||
{ open_temp_exec_file_dir, "/var/tmp", 0 },
|
||||
11
libffi-aarch64-rhbz1174037.patch
Normal file
11
libffi-aarch64-rhbz1174037.patch
Normal file
|
|
@ -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;
|
||||
|
||||
164
libffi.spec
164
libffi.spec
|
|
@ -1,49 +1,22 @@
|
|||
%bcond_with bootstrap
|
||||
|
||||
%global multilib_arches %{ix86} x86_64
|
||||
%global multilib_arches %{ix86} ppc ppc64 ppc64p7 s390 s390x x86_64
|
||||
|
||||
Name: libffi
|
||||
Version: 3.5.2
|
||||
Release: 1%{?dist}
|
||||
Version: 3.1
|
||||
Release: 29%{?dist}
|
||||
Summary: A portable foreign function interface library
|
||||
# No license change for 3.5.2
|
||||
# No license change for 3.5.1
|
||||
# No license change for 3.4.8
|
||||
# No license change for 3.4.7
|
||||
# No license change for 3.4.6
|
||||
# The following SPDX licenses are extracted from the sources using
|
||||
# ScanCode 32.0.8 on build libffi-3.4.4-7.fc40:
|
||||
#
|
||||
# MIT - Most of the project sources (Required)
|
||||
# CC-PDDC - src/dlmalloc.c (Required)
|
||||
# mit OR gpl-3.0 - ltmain.sh (Ignored)
|
||||
# mit OR gpl-1.0-plus - ltmain.sh (Ignored)
|
||||
# gpl-2.0-plus WITH libtool-exception-2.0 - ltmain.sh, libtool.m4, configure (Ignored, not shipped)
|
||||
# warranty-disclaimer - ltmain.sh (Ignored)
|
||||
# unknown-license-reference - ltmain.sh (Ignored)
|
||||
# gpl-2.0-plus - Used by build system only (Ignored)
|
||||
# gpl-2.0 - Used by build system only (Ignored)
|
||||
# free-unknown - config.guess, config.sub (Ignored)
|
||||
# fsf-ap - Used by build system only (Ignored)
|
||||
# fsf-free - Used by build system only (Ignored)
|
||||
# fsf-unlimited - Used by build system only (Ignored)
|
||||
# fsf-unlimited-no-warranty - Used by build system only (Ignored)
|
||||
# gpl-1.0-plus - False positive in texinfo.tex (Ignored)
|
||||
# gpl-3.0-plus WITH tex-exception - texinfo.tex used in libffi-devel docs (Required)
|
||||
# gpl-2.0-plus WITH autoconf-simple-exception-2.0 - Used by build system only (Ignored)
|
||||
# gpl-3.0 - Used by build system only (Ignored)
|
||||
# gpl-3.0-plus - Used by the testsuite only (Ignored)
|
||||
# gpl-3.0-plus WITH autoconf-exception-2.0 - Used by build system only (Ignored)
|
||||
# gpl-3.0-plus WITH autoconf-simple-exception - Used by build system only (Ignored)
|
||||
# mpl-1.1 OR gpl-2.0-plus OR lgpl-2.1-plus - Not used in build (Ignored)
|
||||
# public-domain - Used by build system only (Ignored)
|
||||
# x11-xconsortium - Used by build system only (Ignored)
|
||||
License: MIT AND CC-PDDC AND (GPL-3.0-or-later WITH Texinfo-exception)
|
||||
License: MIT
|
||||
URL: http://sourceware.org/libffi
|
||||
|
||||
Source0: https://github.com/libffi/libffi/releases/download/v%{version}/libffi-%{version}.tar.gz
|
||||
Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
|
||||
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
|
||||
Patch3: libffi-3.1-aarch64-fix-exec-stack.patch
|
||||
Patch4: libffi-3.1-libffi_tmpdir.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
|
|
@ -79,6 +52,7 @@ layer of a fully featured foreign function interface. A layer must
|
|||
exist above `libffi' that handles type conversions for values passed
|
||||
between the two languages.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -88,14 +62,17 @@ Requires: pkgconfig
|
|||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fixpath
|
||||
%patch1 -p1 -b .execstack
|
||||
%patch2 -p1 -b .aarch64
|
||||
%patch3 -p1 -b .aarch64execstack
|
||||
%patch4 -p1 -b .libffitmpdir
|
||||
|
||||
%build
|
||||
# --disable-multi-os-directory is used because otherwise, on riscv64, the
|
||||
# library is installed under ${_libdir}/lp64d, which we don't want. Other
|
||||
# architectures don't have the same problem so they're unaffected.
|
||||
%configure --disable-static --disable-multi-os-directory
|
||||
%configure --disable-static
|
||||
%make_build
|
||||
|
||||
%check
|
||||
|
|
@ -105,7 +82,6 @@ developing applications that use %{name}.
|
|||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
|
|
@ -121,19 +97,22 @@ mkdir -p $RPM_BUILD_ROOT%{_includedir}
|
|||
# can have both a 32- and 64-bit version of the library, and they each need
|
||||
# their own correct-but-different versions of the headers to be usable.
|
||||
for i in ffi ffitarget; do
|
||||
mv $RPM_BUILD_ROOT%{_includedir}/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h
|
||||
mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h
|
||||
done
|
||||
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ffi.h
|
||||
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h
|
||||
%else
|
||||
mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/{ffi,ffitarget}.h $RPM_BUILD_ROOT%{_includedir}
|
||||
%endif
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_libdir}/libffi.so.8
|
||||
%{_libdir}/libffi.so.8.2.0
|
||||
%doc README
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
|
@ -143,100 +122,15 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h
|
|||
%{_infodir}/libffi.info.*
|
||||
|
||||
%changelog
|
||||
* Fri Sep 5 2025 DJ Delorie <dj@redhat.com> - 3.5.2-1
|
||||
- Rebase to libffi 3.5.1.
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jun 13 2025 DJ Delorie <dj@redhat.com> - 3.5.1-1
|
||||
- Rebase to libffi 3.5.1.
|
||||
|
||||
* Wed May 07 2025 DJ Delorie <dj@redhat.com> - 3.4.8-1
|
||||
- Rebase to libffi 3.4.8.
|
||||
|
||||
* Fri Apr 04 2025 Andrea Bolognani <abologna@redhat.com> - 3.4.7-4
|
||||
- Fix riscv64 build (thanks David Abdurachmanov and Rich Jones)
|
||||
|
||||
* Thu Mar 27 2025 DJ Delorie <dj@redhat.com> - 3.4.7-3
|
||||
- Regenerate configure for previous patch(#2313598)
|
||||
|
||||
* Thu Mar 06 2025 DJ Delorie <dj@redhat.com> - 3.4.7-2
|
||||
- Add PPC64 static trampoline support (#2313598)
|
||||
|
||||
* Tue Feb 18 2025 DJ Delorie <dj@redhat.com> - 3.4.7-1
|
||||
- Rebase to libffi 3.4.7.
|
||||
|
||||
* Wed Jan 22 2025 DJ Delorie <dj@redhat.com> - 3.4.6-5
|
||||
- Fix FTBFS due to C23 compiler (#2340729)
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Aug 21 2024 Carlos O'Donell <carlos@redhat.com> 3.4.6-3
|
||||
- Fix AArch64 BTI enablement issues (#2305877)
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Mar 18 2024 DJ Delorie <dj@redhat.com> - 3.4.6-1
|
||||
- Rebase to libffi 3.4.6.
|
||||
|
||||
* Thu Feb 29 2024 Carlos O'Donell <carlos@redhat.com> - 3.4.4-8
|
||||
- Analyze libffi-3.4.4-7.fc40 sources for license information
|
||||
- Migrate License field to SPDX identifiers for
|
||||
https://docs.fedoraproject.org/en-US/legal/allowed-licenses/
|
||||
https://docs.fedoraproject.org/en-US/legal/update-existing-packages
|
||||
(#2222084)
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Jan 02 2024 Florian Weimer <fweimer@redhat.com> - 3.4.4-5
|
||||
- Add missing declaration of open_temp_exec_file
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue May 02 2023 DJ Delorie <dj@redhat.com> - 3.4.4-3
|
||||
- Enable static trampolines
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Oct 28 2022 DJ Delorie <dj@redhat.com> - 3.4.4-1
|
||||
- Rebase to libffi 3.4.4.
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jan 31 2022 Dan Horák <dan[at]danny.cz> - 3.4.2-8
|
||||
- Fix handling Float128 structs on ppc64le (#2045797)
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 3.4.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
|
||||
|
||||
* Wed Sep 15 2021 Carlos O'Donell <codonell@redhat.com> - 3.4.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
|
||||
|
||||
* Wed Sep 15 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-4
|
||||
- Harmonize spec file layout with downstream.
|
||||
|
||||
* Wed Aug 11 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-3
|
||||
- Rebuild package and bump NEVRA.
|
||||
* Thu Aug 12 2021 Carlos O'Donell <carlos@redhat.com> - 3.1-29
|
||||
- Revert rebase to libffi 3.4.2.
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jun 28 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-1
|
||||
- Rebase to libffi 3.4.2.
|
||||
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
summary: Gating testplan for libffi
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libffi-3.5.2.tar.gz) = 76974a84e3aee6bbd646a6da2e641825ae0b791ca6efdc479b2d4cbcd3ad607df59cffcf5031ad5bd30822961a8c6de164ac8ae379d1804acd388b1975cdbf4d
|
||||
f5898b29bbfd70502831a212d9249d10 libffi-3.1.tar.gz
|
||||
|
|
|
|||
17
tests/tests.yml
Normal file
17
tests/tests.yml
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
---
|
||||
# This first play always runs on the local staging system
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-beakerlib
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- testsuite
|
||||
required_packages:
|
||||
- libffi
|
||||
- libffi-devel
|
||||
- gcc
|
||||
- dejagnu
|
||||
- rpm-build
|
||||
- gcc-c++
|
||||
- strace
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
|
||||
# Copyright (c) 2010 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
|
|
@ -28,7 +28,7 @@ export TESTVERSION=1.0
|
|||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE dynamic_linking.patch dynamic_linking-dg.patch
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
|
|
@ -51,9 +51,9 @@ $(METADATA): Makefile
|
|||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: Runs upstream testsuite" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 35m" >> $(METADATA)
|
||||
@echo "TestTime: 19m" >> $(METADATA)
|
||||
@echo "RunFor: libffi" >> $(METADATA)
|
||||
@echo "Requires: libffi libffi-devel libtool gcc dejagnu rpm-build gcc-c++ texinfo strace" >> $(METADATA)
|
||||
@echo "Requires: libffi libffi-devel gcc dejagnu rpm-build gcc-c++ texinfo strace" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv3" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
|
|
|
|||
29
tests/testsuite/dynamic_linking-dg.patch
Normal file
29
tests/testsuite/dynamic_linking-dg.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
--- testsuite/lib/libffi-dg.exp 2008-02-14 19:45:33.000000000 -0500
|
||||
+++ testsuite/lib/libffi-dg.exp 2015-02-13 13:32:08.422053435 -0500
|
||||
@@ -110,7 +110,7 @@
|
||||
}
|
||||
verbose "gccdir $gccdir"
|
||||
|
||||
- set ld_library_path "."
|
||||
+ set ld_library_path ""
|
||||
append ld_library_path ":${gccdir}"
|
||||
|
||||
set compiler "${gccdir}/xgcc"
|
||||
@@ -127,16 +127,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- # add the library path for libffi.
|
||||
- append ld_library_path ":${blddirffi}/.libs"
|
||||
-
|
||||
verbose "ld_library_path: $ld_library_path"
|
||||
|
||||
# Point to the Libffi headers in libffi.
|
||||
set libffi_include "${blddirffi}/include"
|
||||
verbose "libffi_include $libffi_include"
|
||||
|
||||
- set libffi_dir "${blddirffi}/.libs"
|
||||
+ set libffi_dir "/usr/LIBRARY_DIR"
|
||||
verbose "libffi_dir $libffi_dir"
|
||||
if { $libffi_dir != "" } {
|
||||
set libffi_dir [file dirname ${libffi_dir}]
|
||||
29
tests/testsuite/dynamic_linking.patch
Normal file
29
tests/testsuite/dynamic_linking.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
--- testsuite/lib/libffi.exp 2013-03-16 07:19:39.000000000 -0400
|
||||
+++ testsuite/lib/libffi.exp 2014-10-22 11:10:42.449143642 -0400
|
||||
@@ -118,7 +118,7 @@
|
||||
}
|
||||
verbose "gccdir $gccdir"
|
||||
|
||||
- set ld_library_path "."
|
||||
+ set ld_library_path ""
|
||||
append ld_library_path ":${gccdir}"
|
||||
|
||||
set compiler "${gccdir}/xgcc"
|
||||
@@ -142,16 +142,13 @@
|
||||
|
||||
}
|
||||
|
||||
- # add the library path for libffi.
|
||||
- append ld_library_path ":${blddirffi}/.libs"
|
||||
-
|
||||
verbose "ld_library_path: $ld_library_path"
|
||||
|
||||
# Point to the Libffi headers in libffi.
|
||||
set libffi_include "${blddirffi}/include"
|
||||
verbose "libffi_include $libffi_include"
|
||||
|
||||
- set libffi_dir "${blddirffi}/.libs"
|
||||
+ set libffi_dir "/usr/LIBRARY_DIR"
|
||||
verbose "libffi_dir $libffi_dir"
|
||||
if { $libffi_dir != "" } {
|
||||
set libffi_dir [file dirname ${libffi_dir}]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
summary: Runs upstream testsuite
|
||||
description: ''
|
||||
enabled: true
|
||||
link:
|
||||
- relates: https://bugzilla.redhat.com/show_bug.cgi?id=1031159
|
||||
- relates: https://bugzilla.redhat.com/show_bug.cgi?id=839210
|
||||
- relates: https://bugzilla.redhat.com/show_bug.cgi?id=1006261
|
||||
tag:
|
||||
- CI-Tier-1
|
||||
- RHEL6
|
||||
- Tier1
|
||||
- rhel-buildroot
|
||||
tier: '1'
|
||||
contact: mcermak@redhat.com
|
||||
component:
|
||||
- libffi
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
require:
|
||||
- libffi
|
||||
- libffi-devel
|
||||
- libtool
|
||||
- gcc
|
||||
- dejagnu
|
||||
- rpm-build
|
||||
- gcc-c++
|
||||
- texinfo
|
||||
- strace
|
||||
duration: 35m
|
||||
extra-nitrate: TC#0063644
|
||||
extra-summary: /tools/libffi/Sanity/testsuite
|
||||
extra-task: /tools/libffi/Sanity/testsuite
|
||||
id: 2d3a499f-1f59-40f0-a76c-1c73569d0512
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
|
||||
# Copyright (c) 2010 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include rhts environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
. /usr/lib/beakerlib/beakerlib.sh
|
||||
|
||||
PACKAGES=(libffi libffi-devel gcc dejagnu rpm-build gcc-c++)
|
||||
|
||||
|
|
@ -39,41 +39,39 @@ rlJournalStart
|
|||
fi
|
||||
done;
|
||||
|
||||
rlRun "TmpDir=$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "TmpDir=`mktemp -d`" 0 "Creating tmp directory"
|
||||
rlRun "cp *.patch $TmpDir/"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlFetchSrcForInstalled libffi
|
||||
rlRun "rpm -ivh libffi*.src.rpm"
|
||||
rlRun "popd"
|
||||
rlRun "specfile=$(rpm --eval='%_specdir')/libffi.spec"
|
||||
rlRun "rpmbuild -bp --undefine specpartsdir $specfile"
|
||||
rlRun "rpmbuild -bp $specfile"
|
||||
rlRun "builddir=$(rpm --eval='%_builddir')"
|
||||
rlRun "pushd $(dirname "$(find $builddir -name configure)")"
|
||||
rlRun "pushd $builddir/libffi-*/"
|
||||
rlRun "./configure"
|
||||
rlRun "make"
|
||||
rlRUn "make"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "Run testsuite"
|
||||
set -xe
|
||||
# Patch the testsuite to run with the installed libffi libraries, not
|
||||
# with the ones built from the rpm.
|
||||
# Do not add the current dir or the build dir to ld_library_path
|
||||
sed -i 's/set ld_library_path "."/set ld_library_path ""/' testsuite/lib/libffi*.exp
|
||||
sed -i '/append ld_library_path.*blddirffi/d' testsuite/lib/libffi*.exp
|
||||
# Set ld_library_path to the system libdir (typically /usr/lib or /usr/lib64)
|
||||
MYLIBDIR=$(rpm --eval '%{_libdir}')
|
||||
sed -i 's;set libffi_dir.*"[^"]*";set libffi_dir "'"${MYLIBDIR}"'";' testsuite/lib/libffi*.exp
|
||||
grep -F -e 'set ld_library_path' -e 'set libffi_dir' testsuite/lib/libffi.exp
|
||||
# As of upstream commit 40a7682 the link flags hardcode the library dir so we need to edit that too
|
||||
# by removing the explicit library seach path to the built libraries.
|
||||
# https://github.com/libffi/libffi/commit/40a7682#diff-b4e449eb85934de2bdcf9ee0ac320872a7d09d60df6a24e3f066d7d74f6ddfd0R345
|
||||
sed -i 's;set libffi_link_flags "-L[^"]*";set libffi_link_flags "";' testsuite/lib/libffi*.exp
|
||||
set +xe
|
||||
|
||||
# patching the testsuite to test the installed libraries instead of the built ones
|
||||
if [ -e /usr/lib64/libffi.so ]; then
|
||||
export LD_LIBRARY_PATH=/usr/lib64
|
||||
perl -i -pe 's/LIBRARY_DIR/lib64/' $TmpDir/dynamic_linking.patch
|
||||
perl -i -pe 's/LIBRARY_DIR/lib64/' $TmpDir/dynamic_linking-dg.patch
|
||||
else
|
||||
export LD_LIBRARY_PATH=/usr/lib
|
||||
perl -i -pe 's/LIBRARY_DIR/lib/' $TmpDir/dynamic_linking.patch
|
||||
perl -i -pe 's/LIBRARY_DIR/lib/' $TmpDir/dynamic_linking-dg.patch
|
||||
fi
|
||||
test -e testsuite/lib/libffi.exp && rlRun "patch testsuite/lib/libffi.exp < $TmpDir/dynamic_linking.patch"
|
||||
test -e testsuite/lib/libffi-dg.exp && rlRun "patch testsuite/lib/libffi-dg.exp < $TmpDir/dynamic_linking-dg.patch"
|
||||
rlLog "Checking whether we test really the installed libraries."
|
||||
strace -F -e open,openat,stat -o strace.log -- make check
|
||||
# Count library calls from places different than the libdir we want (MYLIBDIR)
|
||||
LIBFFI_SO_CALLS=$(cat strace.log | grep libffi.so | grep -v ENOENT | grep -v "/usr" | grep -v '"/lib' | grep -c -v 'unfinished')
|
||||
rlAssertGreater "The just built libraries should not be used, everything should be taken from /usr" 5 "$LIBFFI_SO_CALLS"
|
||||
rlRun "cat strace.log | grep libffi.so | grep /usr"
|
||||
LIBFFI_SO_CALLS=`cat strace.log | grep libffi.so | grep -v ENOENT | grep -v 'usr/lib' | grep -v '\"\/lib' | grep -v 'unfinished' | wc -l`
|
||||
rlAssertGreater "The just built libraries should not be used, everything should be taken from /usr" 5 $LIBFFI_SO_CALLS
|
||||
rlRun "cat strace.log | grep libffi.so | grep usr"
|
||||
rlRun "cat strace.log | grep libffi.so | grep rpmbuild" 1
|
||||
rlRun "make check" 0 "RUNNING THE TESTSUITE"
|
||||
rlRun "popd"
|
||||
|
|
@ -81,7 +79,7 @@ rlJournalStart
|
|||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "ls -al $TmpDir"
|
||||
rlBundleLogs logs "$(find . -name 'libffi.sum')" "$(find . -name 'libffi.log')"
|
||||
rlBundleLogs logs $(find . -name 'libffi.sum') $(find . -name 'libffi.log')
|
||||
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue