Drop pkgconf support for compat-libffi3.1.

Resolves: #1891914
This commit is contained in:
Carlos O'Donell 2021-07-29 02:42:45 -04:00
parent 6c5e6e710f
commit ab98c9bdf6
2 changed files with 3 additions and 13 deletions

View File

@ -23,7 +23,6 @@ Patch1: libffi-3.1-fix-exec-stack.patch
Patch2: libffi-aarch64-rhbz1174037.patch Patch2: libffi-aarch64-rhbz1174037.patch
Patch3: libffi-3.1-aarch64-fix-exec-stack.patch Patch3: libffi-3.1-aarch64-fix-exec-stack.patch
Patch4: libffi-3.1-libffi_tmpdir.patch Patch4: libffi-3.1-libffi_tmpdir.patch
Patch5: libffi3.1-pkgconfig.patch
%endif %endif
BuildRequires: make BuildRequires: make
@ -94,7 +93,6 @@ cd %{_builddir}/libffi-3.1
%patch2 -p1 -b .aarch64 %patch2 -p1 -b .aarch64
%patch3 -p1 -b .aarch64execstack %patch3 -p1 -b .aarch64execstack
%patch4 -p1 -b .libffitmpdir %patch4 -p1 -b .libffitmpdir
%patch5 -p1 -b .pkgconfig
%endif %endif
%build %build
@ -186,6 +184,9 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h
%{_infodir}/libffi.info.* %{_infodir}/libffi.info.*
%changelog %changelog
* Thu Jul 29 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-4
- Drop pkgconf support for compat-libffi3.1.
* Tue Jul 27 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-3 * Tue Jul 27 2021 Carlos O'Donell <carlos@redhat.com> - 3.4.2-3
- Add temporary compat-libffi3.1 for library transition. - Add temporary compat-libffi3.1 for library transition.

View File

@ -1,11 +0,0 @@
diff -rup a/libffi.pc.in b/libffi.pc.in
--- a/libffi.pc.in 2020-12-02 15:33:14.076549606 -0500
+++ b/libffi.pc.in 2020-12-02 16:11:42.855654638 -0500
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lffi
+Libs: -L${libdir} libffi.so.6
Cflags: -I${includedir}
Only in b: libffi.pc.in~