Compare commits
No commits in common. "45cc61833971d66fdd74ce435c1b9267e38eb830" and "54dd1449012eba3ca1de65d59400c1403be7b93f" have entirely different histories.
45cc618339
...
54dd144901
@ -1,25 +0,0 @@
|
||||
From 5eb75be13dd909a6248a66fd11d9bd745eae9aa4 Mon Sep 17 00:00:00 2001
|
||||
From: misaka00251 <liuxin@iscas.ac.cn>
|
||||
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)
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 582cd8b81a7578411103a0978dfe1d19c5d75ad1 Mon Sep 17 00:00:00 2001
|
||||
From: Hailiang <mahailiang@uniontech.com>
|
||||
Date: Mon, 10 Mar 2025 14:10:36 +0800
|
||||
Subject: [PATCH] add sw_64 support
|
||||
|
||||
---
|
||||
src/native/unix/configure | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/native/unix/configure b/src/native/unix/configure
|
||||
index 8079a65..cbd75d7 100755
|
||||
--- a/src/native/unix/configure
|
||||
+++ b/src/native/unix/configure
|
||||
@@ -3818,6 +3818,11 @@ printf "%s\n" "failed" >&6; }
|
||||
supported_os="linux"
|
||||
HOST_CPU=loongarch64
|
||||
;;
|
||||
+ sw_64)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"sw_64\\\""
|
||||
+ supported_os="linux"
|
||||
+ HOST_CPU=sw_64
|
||||
+ ;;
|
||||
*)
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
|
||||
printf "%s\n" "failed" >&6; }
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 4334ce2b322f7f958606b9b6003d7e6feba052cf Mon Sep 17 00:00:00 2001
|
||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||
Date: Tue, 4 Jun 2024 08:48:30 +0000
|
||||
Subject: [PATCH] fix build error for loongarch64
|
||||
|
||||
---
|
||||
src/native/unix/configure | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/native/unix/configure b/src/native/unix/configure
|
||||
index cbdc8bd..8079a65 100755
|
||||
--- a/src/native/unix/configure
|
||||
+++ b/src/native/unix/configure
|
||||
@@ -3813,6 +3813,11 @@ printf "%s\n" "failed" >&6; }
|
||||
supported_os="linux"
|
||||
HOST_CPU=riscv64
|
||||
;;
|
||||
+ loongarch64)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"loongarch64\\\""
|
||||
+ supported_os="linux"
|
||||
+ HOST_CPU=loongarch64
|
||||
+ ;;
|
||||
*)
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
|
||||
printf "%s\n" "failed" >&6; }
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/configure commons-daemon-1.3.2-src/src/native/unix/configure
|
||||
--- commons-daemon-1.3.2-src_back/src/native/unix/configure 2022-11-13 23:55:12.532213488 +0800
|
||||
+++ commons-daemon-1.3.2-src/src/native/unix/configure 2022-11-14 00:02:12.999089851 +0800
|
||||
@@ -3990,7 +3990,7 @@
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: jni_md.h found in $JAVA_HOME/$JAVA_INC" >&5
|
||||
printf "%s\n" "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; }
|
||||
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
|
||||
+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
|
||||
--- commons-daemon-1.0.12-src/src/native/unix/configure~ 2013-01-14 07:45:15.000000000 +0100
|
||||
+++ commons-daemon-1.0.12-src/src/native/unix/configure 2013-01-24 15:55:59.757193071 +0100
|
||||
@@ -2776,7 +2776,7 @@
|
||||
echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6
|
||||
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
|
||||
else
|
||||
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
|
||||
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
|
||||
+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
|
||||
fi
|
||||
|
||||
if test "$GCC" = "yes"
|
||||
|
||||
@ -1,9 +1,36 @@
|
||||
diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4
|
||||
--- commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 2022-11-13 23:55:12.531213500 +0800
|
||||
+++ commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 2022-11-14 00:02:13.032089448 +0800
|
||||
@@ -186,6 +186,10 @@
|
||||
supported_os="riscv64"
|
||||
HOST_CPU=riscv64
|
||||
backport from http://svn.apache.org/viewvc?view=revision&revision=1533345
|
||||
|
||||
https://issues.apache.org/jira/browse/DAEMON-308
|
||||
|
||||
---
|
||||
src/native/unix/configure | 4 ++++
|
||||
src/native/unix/support/apsupport.m4 | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
|
||||
+++ commons-daemon-1.0.15-src/src/native/unix/configure
|
||||
@@ -2695,10 +2695,14 @@ echo "$as_me: error: Unsupported operati
|
||||
arm*)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
|
||||
supported_os="arm"
|
||||
HOST_CPU=arm
|
||||
;;
|
||||
+ aarch64*)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
|
||||
+ supported_os="aarch64"
|
||||
+ HOST_CPU=aarch64;;
|
||||
*)
|
||||
echo "$as_me:$LINENO: result: failed" >&5
|
||||
echo "${ECHO_T}failed" >&6
|
||||
{ { echo "$as_me:$LINENO: error: Unsupported CPU architecture \"$host_cpu\"" >&5
|
||||
echo "$as_me: error: Unsupported CPU architecture \"$host_cpu\"" >&2;}
|
||||
--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
|
||||
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
|
||||
@@ -164,10 +164,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||
arm*)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
|
||||
supported_os="arm"
|
||||
HOST_CPU=arm
|
||||
;;
|
||||
+ aarch64*)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
|
||||
@ -12,3 +39,5 @@ diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 com
|
||||
*)
|
||||
AC_MSG_RESULT([failed])
|
||||
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
|
||||
esac
|
||||
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4
|
||||
--- commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 2022-11-13 23:55:12.531213500 +0800
|
||||
+++ commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 2022-11-14 00:02:13.016089643 +0800
|
||||
@@ -93,8 +93,16 @@
|
||||
HOST_CPU=ppc64le
|
||||
;;
|
||||
powerpc*)
|
||||
--- commons-daemon-1.0.15-src/src/native/unix/configure.secondary 2017-08-23 12:52:35.697817597 +0200
|
||||
+++ commons-daemon-1.0.15-src/src/native/unix/configure 2017-08-23 12:53:15.313367933 +0200
|
||||
@@ -2611,8 +2611,16 @@ echo "$as_me: error: Unsupported operati
|
||||
esac
|
||||
case $host_cpu in
|
||||
powerpc)
|
||||
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||
- HOST_CPU=$host_cpu
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
|
||||
@ -20,3 +19,42 @@ diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 com
|
||||
;;
|
||||
sparc*)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||
@@ -2687,7 +2695,7 @@ echo "$as_me: error: Unsupported operati
|
||||
HOST_CPU=ia64
|
||||
fi
|
||||
;;
|
||||
- s390)
|
||||
+ s390 | s390x)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
|
||||
supported_os="s390"
|
||||
HOST_CPU=s390
|
||||
--- commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary 2013-03-27 09:09:02.000000000 +0100
|
||||
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4 2017-08-23 12:53:01.391525956 +0200
|
||||
@@ -80,8 +80,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||
esac
|
||||
case $host_cpu in
|
||||
powerpc)
|
||||
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||
- HOST_CPU=$host_cpu
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
|
||||
+ HOST_CPU=ppc
|
||||
+ ;;
|
||||
+ powerpc64)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\""
|
||||
+ HOST_CPU=ppc64
|
||||
+ ;;
|
||||
+ powerpc64le)
|
||||
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\""
|
||||
+ HOST_CPU=ppc64le
|
||||
;;
|
||||
sparc*)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||
@@ -156,7 +164,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||
HOST_CPU=ia64
|
||||
fi
|
||||
;;
|
||||
- s390)
|
||||
+ s390 | s390x)
|
||||
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
|
||||
supported_os="s390"
|
||||
HOST_CPU=s390
|
||||
|
||||
@ -1,21 +1,18 @@
|
||||
Name: apache-commons-daemon
|
||||
Version: 1.3.3
|
||||
Release: 3
|
||||
Version: 1.0.15
|
||||
Release: 19
|
||||
Summary: Defines API to support an alternative invocation mechanism
|
||||
License: ASL 2.0
|
||||
URL: http://commons.apache.org/daemon
|
||||
Source0: http://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
|
||||
BuildRequires: maven-local java-devel >= 1:1.6.0 jpackage-utils apache-commons-parent
|
||||
BuildRequires: maven-surefire-provider-junit5 xmlto gcc make
|
||||
BuildRequires: maven-surefire-provider-junit xmlto gcc make
|
||||
Provides: apache-commons-daemon-jsvc = %{version}-%{release} jsvc = 1:%{version}-%{release}
|
||||
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
|
||||
Patch0005: 0001-fix-build-error-for-loongarch64.patch
|
||||
Patch0006: 0001-add-sw_64-support.patch
|
||||
|
||||
%description
|
||||
The scope of this package is to define an API in line with the current Java Platform APIs to support
|
||||
@ -48,7 +45,7 @@ cd -
|
||||
|
||||
%mvn_file : commons-daemon apache-commons-daemon
|
||||
%mvn_alias : org.apache.commons:commons-daemon
|
||||
%mvn_build -f
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
|
||||
@ -65,20 +62,5 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
|
||||
%{_mandir}/man1/jsvc.1*
|
||||
|
||||
%changelog
|
||||
* Mon Mar 10 2025 mahailiang <mahailiang@uniontech.com> - 1.3.3-3
|
||||
- add sw_64 support
|
||||
|
||||
* Tue Jun 04 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.3.3-2
|
||||
- fix build error for loongarch64
|
||||
|
||||
* Tue May 09 2023 Ge Wang <wang__ge@126.com> - 1.3.3-1
|
||||
- Update to version 1.3.3
|
||||
|
||||
* Wed Mar 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 1.3.2-2
|
||||
- Fix build failed on openEuler RISC-V
|
||||
|
||||
* Sat Nov 12 2022 hua <dchang@zhixundn.com> 1.3.2-1
|
||||
- update to 1.3.2
|
||||
|
||||
* Mon Dec 2 2019 liujing<liujing144@huawei.com> - 1.0.15-19
|
||||
- Package init
|
||||
|
||||
BIN
commons-daemon-1.0.15-src.tar.gz
Normal file
BIN
commons-daemon-1.0.15-src.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user