diff --git a/macros b/macros index 155df444d16c028f73bd5f7723da81fc9dd5eb45..21c6194572b57b4a2a7fe8df011164ed5a3a486c 100644 --- a/macros +++ b/macros @@ -93,6 +93,13 @@ RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ;} \ LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS +%set_pkgconfig_audit_log_file \ + PKG_CONFIG_LOG="%{_builddir}/%{?buildsubdir}/pkgconfig-audit.log" ; export PKG_CONFIG_LOG + +%dump_pkgconfig_audit_log_file \ + cat ${PKG_CONFIG_LOG} ; \ + rm -f ${PKG_CONFIG_LOG} + # Automatically use set_build_flags macro for build, check, and # install phases. # Use "%undefine _auto_set_build_flags" to disable" @@ -101,10 +108,20 @@ # Use "%undefine _auto_set_build_cc" to disable" %_auto_set_build_cc %["%{toolchain}" == "gcc" ? 0 : 1] %_auto_set_build_flags 0 +%_auto_dump_pkgconfig_audit_log 0 + +%__spec_conf_pre %{___conf_pre} \ + %[0%{?_auto_dump_pkgconfig_audit_log} ? "%{set_pkgconfig_audit_log_file}" : ""] %__spec_build_pre %{___build_pre} \ %[0%{?_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ - %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""] + %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""] \ + %[0%{?_auto_dump_pkgconfig_audit_log} ? "%{set_pkgconfig_audit_log_file}" : ""] + +%__spec_build_post \ + %[0%{?_auto_dump_pkgconfig_audit_log} ? "%{dump_pkgconfig_audit_log_file}" : ""] \ + %{___build_post} + %__spec_check_pre %{___build_pre} \ %[0%{?_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""] diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 037043910b8f807c7449e2a7e3d9845ed5a8f231..46a4bc63c59f28fcbe2490e9e8a78c6a11670f2d 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 31 -Release: 38 +Release: 39 License: GPL+ AND MIT Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -123,6 +123,7 @@ BuildRequires: %{vendor}-release Requires: rpm >= 4.17.0 Requires: rpm-build >= 4.17.0 +Requires: (pkgconf >= 2.5.1-2 if pkgconf) Requires: zip Requires: curl #Requires: (annobin if gcc) @@ -212,6 +213,9 @@ sed -i "s|@OSCPE@|$(cat /etc/system-release-cpe)|" %{buildroot}%{rpmvdir}/%{vend %{rpmvdir}/find-requires.ksyms %changelog +* Fri Oct 10 2025 Funda Wang - 31-39 +- add switch dumping pkgconfig audit log when building + * Wed Sep 24 2025 Funda Wang - 31-38 - add buildsystem support for autotools