From 2bb9eec658986fd7591ad8d9099ccc0600a0026c Mon Sep 17 00:00:00 2001 From: misaka00251 Date: Wed, 22 Mar 2023 15:54:17 +0800 Subject: [PATCH] Fix build failed on openEuler RISC-V --- ...Fix-build-failed-on-openEuler-RISC-V.patch | 25 +++++++++++++++++++ apache-commons-daemon.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-failed-on-openEuler-RISC-V.patch diff --git a/0001-Fix-build-failed-on-openEuler-RISC-V.patch b/0001-Fix-build-failed-on-openEuler-RISC-V.patch new file mode 100644 index 0000000..1fa9e8a --- /dev/null +++ b/0001-Fix-build-failed-on-openEuler-RISC-V.patch @@ -0,0 +1,25 @@ +From 5eb75be13dd909a6248a66fd11d9bd745eae9aa4 Mon Sep 17 00:00:00 2001 +From: misaka00251 +Date: Wed, 22 Mar 2023 15:16:29 +0800 +Subject: [PATCH] Fix build failed on openEuler RISC-V + +--- + src/native/unix/configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/native/unix/configure b/src/native/unix/configure +index 62d2cb2..cc068a8 100755 +--- a/src/native/unix/configure ++++ b/src/native/unix/configure +@@ -3810,7 +3810,7 @@ printf "%s\n" "failed" >&6; } + ;; + riscv64) + CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\"" +- supported_os="riscv64" ++ supported_os="linux" + HOST_CPU=riscv64 + ;; + *) +-- +2.37.1 (Apple Git-137.1) + diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 08ed04b..9345d56 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -1,6 +1,6 @@ Name: apache-commons-daemon Version: 1.3.2 -Release: 1 +Release: 2 Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 URL: http://commons.apache.org/daemon @@ -13,6 +13,7 @@ Obsoletes: apache-commons-daemon-jsvc < %{version}-%{release} Patch0001: apache-commons-daemon-JAVA_OS.patch Patch0002: apache-commons-daemon-secondary.patch Patch0003: apache-commons-daemon-aarch64.patch +Patch0004: 0001-Fix-build-failed-on-openEuler-RISC-V.patch %description The scope of this package is to define an API in line with the current Java Platform APIs to support @@ -62,6 +63,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 %{_mandir}/man1/jsvc.1* %changelog +* Wed Mar 22 2023 misaka00251 - 1.3.2-2 +- Fix build failed on openEuler RISC-V + * Sat Nov 12 2022 hua 1.3.2-1 - update to 1.3.2