pool/pkgconf
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 721058 from devel:tools

Browse Source 
- Add missing -gnu ABI suffix to platform names in pkgconf-pkg-config (boo#1144318)

OBS-URL: https://build.opensuse.org/request/show/721058
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pkgconf?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2019-08-06 13:11:35 +00:00 committed by Git OBS Bridge
commit 7a5e78f03c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgconf.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 5 12:46:49 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- Add missing -gnu ABI suffix to platform names in pkgconf-pkg-config (boo#1144318)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 15 00:28:33 UTC 2019 - Neal Gompa <ngompa13@gmail.com> Mon Jul 15 00:28:33 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

11
pkgconf.spec
View File

@ -34,6 +34,9 @@
%global pkgconfig_obsver %{pkgconfig_ver}+1 %global pkgconfig_obsver %{pkgconfig_ver}+1
%endif %endif
# pkgconfig platform
%global pkgconf_target_platform %{_target_platform}%{?_gnu}
# Search path for pc files for pkgconf # Search path for pc files for pkgconf
%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@ -162,13 +165,13 @@ EOM
rm -rf %{buildroot}%{_datadir}/doc/%{name} rm -rf %{buildroot}%{_datadir}/doc/%{name}
%if %{with pkgconfig_compat} %if %{with pkgconfig_compat}
install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config
sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ sed -e "s|@TARGET_PLATFORM@|%{pkgconf_target_platform}|" \
-e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \
-e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \ -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \
-e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \
-i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config -i %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config
ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
@ -218,7 +221,7 @@ rm -rf %{buildroot}%{_mandir}/man7
%files pkg-config %files pkg-config
%{_bindir}/pkg-config %{_bindir}/pkg-config
%{_bindir}/%{_target_platform}-pkg-config %{_bindir}/%{pkgconf_target_platform}-pkg-config
%{_mandir}/man1/pkg-config.1* %{_mandir}/man1/pkg-config.1*
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
%dir %{_datadir}/pkgconfig %dir %{_datadir}/pkgconfig