rpm/Unbundle-config-site-and-add-RPM-LD-FLAGS-macro.patch

41 lines
1.3 KiB
Diff
Raw Normal View History

2020-01-10 17:01:49 +08:00
From eee654b9652fb9387018f9653431a11401a354fd Mon Sep 17 00:00:00 2001
From: openeuler-basic <shenyangyang4@huawei.com>
Date: Thu, 9 Jan 2020 19:16:58 +0800
Subject: [PATCH] Unbundle config site and add RPM LD FLAGS macro
---
2023-06-28 17:42:42 +08:00
macros.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
2020-01-10 17:01:49 +08:00
diff --git a/macros.in b/macros.in
2023-06-28 17:42:42 +08:00
index a2411d7..8cb8a5a 100644
2020-01-10 17:01:49 +08:00
--- a/macros.in
+++ b/macros.in
2023-06-28 17:42:42 +08:00
@@ -727,10 +727,11 @@ package or when debugging this package.\
RPM_SOURCE_DIR=\"%{_sourcedir}\"\
RPM_BUILD_DIR=\"%{_builddir}\"\
2020-01-10 17:01:49 +08:00
RPM_OPT_FLAGS=\"%{optflags}\"\
+ RPM_LD_FLAGS=\"%{?build_ldflags}\"\
RPM_ARCH=\"%{_arch}\"\
RPM_OS=\"%{_os}\"\
RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
2023-06-28 17:42:42 +08:00
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUSi RPM_OPT_FLAGS\
2020-01-10 17:01:49 +08:00
RPM_DOC_DIR=\"%{_docdir}\"\
export RPM_DOC_DIR\
RPM_PACKAGE_NAME=\"%{NAME}\"\
2023-06-28 17:42:42 +08:00
@@ -746,7 +747,9 @@ package or when debugging this package.\
%{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
2020-01-10 17:01:49 +08:00
export CLASSPATH}\
PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
2023-06-28 17:42:42 +08:00
- export PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH\
2020-01-10 17:01:49 +08:00
+ CONFIG_SITE=${CONFIG_SITE:-NONE}\
2023-06-28 17:42:42 +08:00
+ export CONFIG_SITE
%___build_pre \
%{___build_pre_env} \
2020-01-10 17:01:49 +08:00
--
2023-06-28 17:42:42 +08:00
2.27.0
2020-01-10 17:01:49 +08:00