rpms/pkgconf
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Make /usr/bin/pkg-config multilib safe

Browse Source
This commit is contained in:
Neal Gompa 2020-10-14 22:35:57 -04:00
parent 05c8560a2e
commit ac4bf07a65
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg-config.in Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config
HOST_PLATFORM=$(rpm --eval "%{_host}")
exec "@PKGCONF_BINDIR@/${HOST_PLATFORM}-pkg-config" "$@"

13
pkgconf.spec
View File

@ -17,7 +17,7 @@
Name: pkgconf
Version: 1.7.3
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Package compiler and linker metadata toolkit
License: ISC
@ -25,8 +25,9 @@ URL: http://pkgconf.org/
# Mirror at https://releases.pagure.org/pkgconf/pkgconf/
Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
# Simple wrapper script to offer platform versions of pkgconfig
# Simple wrapper scripts to offer platform versions of pkgconfig
Source1: platform-pkg-config.in
Source2: pkg-config.in
BuildRequires: gcc
BuildRequires: make
@ -146,7 +147,10 @@ sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \
-e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \
-i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
ln -sr %{buildroot}%{_bindir}/%{_target_platform}-pkg-config %{buildroot}%{_bindir}/pkg-config
install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/pkg-config
sed -e "s|@PKGCONF_BINDIR@|%{_bindir}|" \
-i %{buildroot}%{_bindir}/pkg-config
# Link pkg-config(1) to pkgconf(1)
echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1
@ -198,6 +202,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%changelog
* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-3
- Make /usr/bin/pkg-config multilib safe
* Mon Aug 10 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-2
- Add /usr/local paths to pkg-config(1) search path for non RPM builds