From 6a67650a6135f6b8ea8c3d61b8603fbd4cf67dfb Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Fri, 18 Sep 2020 12:56:29 +0000 Subject: [PATCH 1/2] Fix libffi normal package build --- SPECS/libffi/libffi.spec | 17 +++++++++-------- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 6 +++--- .../manifests/package/toolchain_x86_64.txt | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/SPECS/libffi/libffi.spec b/SPECS/libffi/libffi.spec index ee8cf94b7fa..94b6d083a17 100644 --- a/SPECS/libffi/libffi.spec +++ b/SPECS/libffi/libffi.spec @@ -1,7 +1,7 @@ Summary: A portable, high level programming interface to various calling conventions Name: libffi Version: 3.2.1 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD URL: http://sourceware.org/libffi/ Group: System Environment/GeneralLibraries @@ -30,16 +30,14 @@ It contains the libraries and header files to create applications %build sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(includedir):' \ -i include/Makefile.in && +sed -e 's:$(DESTDIR)$(toolexeclibdir):$(DESTDIR)$(libdir):g' \ + -i Makefile.in && sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@includedir@:' \ -e 's/^Cflags: -I${includedir}/Cflags:/' \ -i libffi.pc.in && -./configure \ - CFLAGS="%{optflags}" \ - CXXFLAGS="%{optflags}" \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --disable-static +%configure \ + --disable-static + make %{?_smp_mflags} %install [ %{buildroot} != "/"] && rm -rf %{buildroot}/* @@ -76,6 +74,9 @@ rm -rf %{buildroot}/* %{_mandir}/man3/* %changelog +* Fri Sep 18 2020 Mateusz Malisz 3.2.1-11 +- Fix normal libffi build by replacing destination for .so files from $(toolexeclibdir) to $(libdir) +- Replace ./configure and manual options with %%configure macro * Tue Jul 07 2020 Henry Beberman 3.2.1-10 - Comment out dejagnu dependency and check to prevent a rebuild. * Wed May 13 2020 Nick Samson 3.2.1-9 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 1698eaa8ca4..7dd95a61503 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -156,7 +156,7 @@ pinentry-1.1.0-3.cm1.aarch64.rpm gnupg2-2.2.20-3.cm1.aarch64.rpm gpgme-1.13.1-5.cm1.aarch64.rpm mariner-repos-1.0-9.cm1.noarch.rpm -libffi-3.2.1-10.cm1.aarch64.rpm +libffi-3.2.1-11.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm p11-kit-0.23.16.1-2.cm1.aarch64.rpm p11-kit-trust-0.23.16.1-2.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 6ba6a489583..0984c4117b9 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -156,7 +156,7 @@ pinentry-1.1.0-3.cm1.x86_64.rpm gnupg2-2.2.20-3.cm1.x86_64.rpm gpgme-1.13.1-5.cm1.x86_64.rpm mariner-repos-1.0-9.cm1.noarch.rpm -libffi-3.2.1-10.cm1.x86_64.rpm +libffi-3.2.1-11.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm p11-kit-0.23.16.1-2.cm1.x86_64.rpm p11-kit-trust-0.23.16.1-2.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index daa3f832a98..f89bd80a91f 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -168,9 +168,9 @@ libdb-5.3.28-4.cm1.aarch64.rpm libdb-debuginfo-5.3.28-4.cm1.aarch64.rpm libdb-devel-5.3.28-4.cm1.aarch64.rpm libdb-docs-5.3.28-4.cm1.aarch64.rpm -libffi-3.2.1-10.cm1.aarch64.rpm -libffi-debuginfo-3.2.1-10.cm1.aarch64.rpm -libffi-devel-3.2.1-10.cm1.aarch64.rpm +libffi-3.2.1-11.cm1.aarch64.rpm +libffi-debuginfo-3.2.1-11.cm1.aarch64.rpm +libffi-devel-3.2.1-11.cm1.aarch64.rpm libgcc-9.1.0-7.cm1.aarch64.rpm libgcc-atomic-9.1.0-7.cm1.aarch64.rpm libgcc-devel-9.1.0-7.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index b8638c2fadc..901d037d590 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -168,9 +168,9 @@ libdb-5.3.28-4.cm1.x86_64.rpm libdb-debuginfo-5.3.28-4.cm1.x86_64.rpm libdb-devel-5.3.28-4.cm1.x86_64.rpm libdb-docs-5.3.28-4.cm1.x86_64.rpm -libffi-3.2.1-10.cm1.x86_64.rpm -libffi-debuginfo-3.2.1-10.cm1.x86_64.rpm -libffi-devel-3.2.1-10.cm1.x86_64.rpm +libffi-3.2.1-11.cm1.x86_64.rpm +libffi-debuginfo-3.2.1-11.cm1.x86_64.rpm +libffi-devel-3.2.1-11.cm1.x86_64.rpm libgcc-9.1.0-7.cm1.x86_64.rpm libgcc-atomic-9.1.0-7.cm1.x86_64.rpm libgcc-devel-9.1.0-7.cm1.x86_64.rpm From 5577ba12518738eede6443639363171063c848a7 Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Fri, 18 Sep 2020 13:33:44 +0000 Subject: [PATCH 2/2] Add comment explaining the purpose of the sed call --- SPECS/libffi/libffi.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SPECS/libffi/libffi.spec b/SPECS/libffi/libffi.spec index 94b6d083a17..e89fb1ec113 100644 --- a/SPECS/libffi/libffi.spec +++ b/SPECS/libffi/libffi.spec @@ -29,12 +29,15 @@ It contains the libraries and header files to create applications %build sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(includedir):' \ - -i include/Makefile.in && + -i include/Makefile.in +# Fix .so files getting placed in $(libdir)/../lib64/ sed -e 's:$(DESTDIR)$(toolexeclibdir):$(DESTDIR)$(libdir):g' \ - -i Makefile.in && + -i Makefile.in + sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@includedir@:' \ -e 's/^Cflags: -I${includedir}/Cflags:/' \ - -i libffi.pc.in && + -i libffi.pc.in + %configure \ --disable-static