Skip to content

Fix libffi normal package build #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jslobodzian merged 2 commits into from
Sep 19, 2020
Merged

Fix libffi normal package build #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a67650
Fix libffi normal package build
MateuszMalisz Sep 18, 2020
5577ba1
Add comment explaining the purpose of the sed call
MateuszMalisz Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions SPECS/libffi/libffi.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -29,17 +29,18 @@ 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

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
-i libffi.pc.in

%configure \
--disable-static

make %{?_smp_mflags}
%install
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
Expand Down Expand Up @@ -76,6 +77,9 @@ rm -rf %{buildroot}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 18 2020 Mateusz Malisz <mamalisz@microsoft.com> 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 <henry.beberman@microsoft.com> 3.2.1-10
- Comment out dejagnu dependency and check to prevent a rebuild.
* Wed May 13 2020 Nick Samson <nisamson@microsoft.com> 3.2.1-9
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down