Merge pull request !2 from syyhao/dev
This commit is contained in:
openeuler-ci-bot 2020-01-13 09:20:45 +08:00 committed by Gitee
commit 04cb2faeaf
2 changed files with 19 additions and 20 deletions

View File

@ -2,15 +2,13 @@
Name: pkgconf Name: pkgconf
Version: 1.6.3 Version: 1.6.3
Release: 5 Release: 6
Summary: Package compiler and linker metadata toolkit Summary: Package compiler and linker metadata toolkit
License: ISC License: ISC
URL: http://pkgconf.org/ URL: http://pkgconf.org/
Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
Source1: platform-pkg-config.in
BuildRequires: gcc, make, autoconf, automake, libtool BuildRequires: gcc, make, autoconf, automake, libtool
#tests #tests
BuildRequires: kyua, atf-tests BuildRequires: kyua, atf-tests
@ -65,13 +63,18 @@ make check
%delete_la_and_a %delete_la_and_a
install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config cat <<EOF > %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
#!/bin/sh
sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ # Platform-specific version of pkg-config
-e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ # Platform----%{_target_platform}
-e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \
-e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ export PKG_CONFIG_LIBDIR="\${PKG_CONFIG_LIBDIR:-%{pkgconf_libdirs}}"
-i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config export PKG_CONFIG_SYSTEM_INCLUDE_PATH="\${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-%{_includedir}}"
export PKG_CONFIG_SYSTEM_LIBRARY_PATH="\${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-%{_libdir}}"
exec pkgconf "\$@"
EOF
ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
@ -88,7 +91,7 @@ mkdir -p %{buildroot}%{_datadir}/pkgconfig
%{_libdir}/lib%{name}*.so.* %{_libdir}/lib%{name}*.so.*
%{_datadir}/aclocal/pkg.m4 %{_datadir}/aclocal/pkg.m4
%{_bindir}/pkg-config %{_bindir}/pkg-config
%{_bindir}/%{_target_platform}-pkg-config %attr(755,root,root) %{_bindir}/%{_target_platform}-pkg-config
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
%dir %{_datadir}/pkgconfig %dir %{_datadir}/pkgconfig
@ -101,6 +104,12 @@ mkdir -p %{buildroot}%{_datadir}/pkgconfig
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.6.3-6
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: strengthen spec
* Thu Nov 28 2019 shenyangyang <shenyangyang4@huawei.com> - 1.6.3-5 * Thu Nov 28 2019 shenyangyang <shenyangyang4@huawei.com> - 1.6.3-5
- Type: enhancement - Type: enhancement
- ID: NA - ID: NA

View File

@ -1,10 +0,0 @@
#!/bin/sh
# Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
# Platform: @TARGET_PLATFORM@
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}"
export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}"
export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}"
exec pkgconf "$@"