packages/openEuler-rpm-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix riscv64 default library directory of brp-ldconfig

Browse Source
This commit is contained in:
laokz 2023-03-08 20:02:04 +08:00 committed by laokz
parent 5a4967ad1b
commit b1c962c264
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fix-brp-ldconfig-riscv-default-library-directory.patch Normal file
View File

@ -0,0 +1,15 @@
--- openEuler-rpm-config/brp-ldconfig 2020-08-20 17:13:06.000000000 +0800
+++ openEuler-rpm-config/brp-ldconfig.new 2023-03-08 19:45:58.241036244 +0800
@@ -5,4 +5,12 @@
exit 0
fi
+riscv64_lp64d=0
+if [ "$HOSTTYPE" = "riscv64" -a -e $RPM_BUILD_ROOT/usr/lib64 -a ! -e $RPM_BUILD_ROOT/usr/lib64/lp64d ]; then
+ ln -s . $RPM_BUILD_ROOT/usr/lib64/lp64d
+ riscv64_lp64d=1
+fi
/sbin/ldconfig -N -r "$RPM_BUILD_ROOT"
+if [ $riscv64_lp64d = 1 ]; then
+ rm -f $RPM_BUILD_ROOT/usr/lib64/lp64d
+fi

10
openEuler-rpm-config.spec
View File

@ -3,7 +3,7 @@
Name: %{vendor}-rpm-config
Version: 30
Release: 36
Release: 37
License: GPL+
Summary: specific rpm configuration files
URL: https://gitee.com/openeuler/openEuler-rpm-config
@ -28,6 +28,7 @@ Patch14: backport-kmp-feature.patch
Patch15: 0001-add-loongarch64-for-golang_arches.patch
Patch16: fix-config-error-for-loongarch64.patch
Patch17: Feature-support-EBS-sign-for-IMA-digest-list.patch
Patch18: fix-brp-ldconfig-riscv-default-library-directory.patch
Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
@ -78,6 +79,10 @@ Requires: %{_bindir}/grep
Requires: %{_bindir}/sed
Requires: %{_bindir}/xargs
%if "%{_arch}" == "riscv64"
Requires: coreutils
%endif
# -fstack-clash-protection and -fcf-protection require GCC 8.
Conflicts: gcc < 7
@ -135,6 +140,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
%{rpmvdir}/find-requires.ksyms
%changelog
* Fri Mar 24 2023 laokz <zhangkai@iscas.ac.cn> - 30-37
- fix riscv64 default library directory of brp-ldconfig
* Fri Mar 17 2023 Xinliang Liu <xinliang.liu@linaro.org> - 30-36
- Fix kmod rpm install failed.