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

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pkgconf.git#5dea89a881102185fe291a7a4902a10caa5b9a5e
This commit is contained in:
DistroBaker 2020-10-27 21:50:38 +01:00 committed by Petr Šabata
parent d097a37db4
commit 836b38b59d
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg-config.in Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
# Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config
## Vendored definition of %_target_platform from redhat-rpm-config to avoid depending on it
TARGET_PLATFORM=$(rpm --eval '%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}')
exec "@PKGCONF_BINDIR@/${TARGET_PLATFORM}-pkg-config" "$@"

19
pkgconf.spec
View File

@ -17,7 +17,7 @@
Name: pkgconf
Version: 1.7.3
Release: 2%{?dist}
Release: 5%{?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,15 @@ rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%changelog
* Mon Oct 19 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-5
- Use internal target platform definition for pkg-config wrapper
* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-4
- Fix pkg-config wrapper for armv7hl
* 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