From 00558e8fa7194b17fdd218bb23ffeeb4ddd41be1 Mon Sep 17 00:00:00 2001 From: wangyaoyong Date: Thu, 23 May 2024 18:05:56 +0800 Subject: [PATCH 1/2] fix issue:I9KZET compile error on riscv64 --- 0007-fix-compile-error-on-riscv64.patch | 29 +++++++++++++++++++++++++ utshell.spec | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0007-fix-compile-error-on-riscv64.patch diff --git a/0007-fix-compile-error-on-riscv64.patch b/0007-fix-compile-error-on-riscv64.patch new file mode 100644 index 0000000..7e65a7e --- /dev/null +++ b/0007-fix-compile-error-on-riscv64.patch @@ -0,0 +1,29 @@ +From b93998a221ad9e78540253016eadd634a39c1598 Mon Sep 17 00:00:00 2001 +From: wangyaoyong +Date: Thu, 23 May 2024 17:59:49 +0800 +Subject: [PATCH 1/1] fix compile error on riscv64 + +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6affd14..0e8ff16 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -598,10 +598,10 @@ $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) rust_builtins_lib rust + @echo " ***********************************************************" + @echo + +-rust_mainland_lib: ++rust_mainland_lib: $(SHLIB_LIBRARY) + @for it in $(RUST_MAINLAND_DIRS); do cd $$it ; cargo build; cd -; done + +-rust_builtins_lib: ++rust_builtins_lib: $(SHLIB_LIBRARY) + @for it in $(RUST_BUILTINS_DIRS); do cd $$it ; cargo build; cd -; done + + +-- +2.25.1 + diff --git a/utshell.spec b/utshell.spec index 293841e..bf5239b 100644 --- a/utshell.spec +++ b/utshell.spec @@ -6,7 +6,7 @@ Version: %{baseversion}%{patchleveltag} Name: utshell Summary: The utshell respect Bash -Release: 0%{?dist}.3 +Release: 0%{?dist}.4 License: GPLv3+ Source0: utshell-%{baseversion}.tar.gz @@ -18,6 +18,7 @@ Patch0003: 0003-fix-exec-c-exec-l-Redundant-output.patch Patch0004: 0004-fix-complete-p-no-display.patch Patch0005: 0005-fix-translation-files-correlation.patch Patch0006: 0006-fix-select-error.patch +Patch0007: 0007-fix-compile-error-on-riscv64.patch # Other patches # We don't want to add '/etc:/usr/etc' in standard utils path. @@ -134,6 +135,9 @@ end %{_includedir}/%{name} %changelog +* Thu May 23 2024 wangyaoyong - 0.5.0-0.4 +- fix:I9KZET riscv64 下cargo build编译时出现缺少依赖的问题 + * Thu May 9 2024 wangmeng - 0.5.0-0.3 - fix:I9CANW select 关键字没有输出 -- Gitee From e20c6c3ef4ea7048629bac0a39c823304f884c28 Mon Sep 17 00:00:00 2001 From: wangmengc Date: Fri, 21 Jun 2024 17:06:35 +0800 Subject: [PATCH 2/2] #IA4DBK Change the version number to be consistent with other software packages --- utshell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utshell.spec b/utshell.spec index bf5239b..afb1352 100644 --- a/utshell.spec +++ b/utshell.spec @@ -6,7 +6,7 @@ Version: %{baseversion}%{patchleveltag} Name: utshell Summary: The utshell respect Bash -Release: 0%{?dist}.4 +Release: 1%{?dist} License: GPLv3+ Source0: utshell-%{baseversion}.tar.gz @@ -135,6 +135,9 @@ end %{_includedir}/%{name} %changelog +* Fri Jun 21 2024 wangmeng - 0.5.1 +- fix:IA4DBK Change the verson number to be consistent with other software packages + * Thu May 23 2024 wangyaoyong - 0.5.0-0.4 - fix:I9KZET riscv64 下cargo build编译时出现缺少依赖的问题 -- Gitee