!169 excute brp_chrpath before arch_install_post
From: @xujing99 Reviewed-by: @licunlong Signed-off-by: @licunlong
This commit is contained in:
commit
63bc8eb857
@ -1,4 +1,4 @@
|
||||
From 3f8ed7eb46f9863f461a8abcdb1fe2c4de505900 Mon Sep 17 00:00:00 2001
|
||||
From 3247ab3820c98cee1b47f1c0bf5f0714c3324fde Mon Sep 17 00:00:00 2001
|
||||
From: gaoyi <gaoyi15@huawei.com>
|
||||
Date: Fri, 6 Mar 2020 06:04:41 -0500
|
||||
Subject: [PATCH] add brp scripts to delete rpath
|
||||
@ -122,7 +122,7 @@ index 0000000..dc48351
|
||||
+
|
||||
+exit 0
|
||||
diff --git a/macros b/macros
|
||||
index 7cde63f..5eb7f18 100644
|
||||
index 36621df..a316be9 100644
|
||||
--- a/macros
|
||||
+++ b/macros
|
||||
@@ -89,6 +89,7 @@
|
||||
@ -133,14 +133,14 @@ index 7cde63f..5eb7f18 100644
|
||||
%__brp_ldconfig /usr/lib/rpm/brp-ldconfig
|
||||
%__brp_compress /usr/lib/rpm/brp-compress
|
||||
%__brp_strip /usr/lib/rpm/brp-strip %{__strip}
|
||||
@@ -107,6 +108,7 @@
|
||||
%{?__brp_strip_static_archive} \
|
||||
%{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \
|
||||
%{?__brp_python_hardlink} \
|
||||
+ %{?__vendor_delete_rpath:%{?__brp_chrpath}} \
|
||||
%{nil}
|
||||
@@ -111,6 +112,7 @@
|
||||
|
||||
%__spec_install_post\
|
||||
%{?__debug_package:%{__debug_install_post}}\
|
||||
+ %{?__vendor_delete_rpath:%{?__brp_chrpath}} \
|
||||
%{__arch_install_post}\
|
||||
%{__os_install_post}\
|
||||
%{nil}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Name: %{vendor}-rpm-config
|
||||
Version: 30
|
||||
Release: 22
|
||||
Release: 23
|
||||
License: GPL+
|
||||
Summary: specific rpm configuration files
|
||||
URL: https://gitee.com/openeuler/openEuler-rpm-config
|
||||
@ -118,6 +118,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
|
||||
%{_rpmconfigdir}/macros.d/macros.kmp
|
||||
|
||||
%changelog
|
||||
* Tue Nov 21 2023 xujing <xujing125@huawei.com> - 30-23
|
||||
- excute brp_chrpath before arch_install_post
|
||||
|
||||
* Mon Nov 20 2023 xujing <xujing125@huawei.com> - 30-22
|
||||
- add the scanning path of the rpath
|
||||
use vendor name to determine whether to delete rpath
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user