Compare commits
10 Commits
f15e0e2924
...
4cc9b2cc70
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4cc9b2cc70 | ||
|
|
a6b8a56329 | ||
|
|
3e84bff727 | ||
|
|
639cf5ab3f | ||
|
|
a21f4c0739 | ||
|
|
2bb9eec658 | ||
|
|
3596f1240e | ||
|
|
eee97ef4fd | ||
|
|
54dd144901 | ||
|
|
6f809f327b |
25
0001-Fix-build-failed-on-openEuler-RISC-V.patch
Normal file
25
0001-Fix-build-failed-on-openEuler-RISC-V.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
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)
|
||||||
|
|
||||||
28
0001-fix-build-error-for-loongarch64.patch
Normal file
28
0001-fix-build-error-for-loongarch64.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
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
|
||||||
|
|
||||||
39
README.md
39
README.md
@ -1,39 +0,0 @@
|
|||||||
# apache-commons-daemon
|
|
||||||
|
|
||||||
#### 介绍
|
|
||||||
{**以下是码云平台说明,您可以替换此简介**
|
|
||||||
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台
|
|
||||||
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
|
|
||||||
|
|
||||||
#### 软件架构
|
|
||||||
软件架构说明
|
|
||||||
|
|
||||||
|
|
||||||
#### 安装教程
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### 使用说明
|
|
||||||
|
|
||||||
1. xxxx
|
|
||||||
2. xxxx
|
|
||||||
3. xxxx
|
|
||||||
|
|
||||||
#### 参与贡献
|
|
||||||
|
|
||||||
1. Fork 本仓库
|
|
||||||
2. 新建 Feat_xxx 分支
|
|
||||||
3. 提交代码
|
|
||||||
4. 新建 Pull Request
|
|
||||||
|
|
||||||
|
|
||||||
#### 码云特技
|
|
||||||
|
|
||||||
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
|
||||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
|
||||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
|
||||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
|
|
||||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
|
||||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
|
||||||
12
apache-commons-daemon-JAVA_OS.patch
Normal file
12
apache-commons-daemon-JAVA_OS.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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"
|
||||||
|
else
|
||||||
|
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
|
||||||
|
fi
|
||||||
14
apache-commons-daemon-aarch64.patch
Normal file
14
apache-commons-daemon-aarch64.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
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
|
||||||
|
;;
|
||||||
|
+ aarch64*)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
|
||||||
|
+ supported_os="aarch64"
|
||||||
|
+ HOST_CPU=aarch64;;
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT([failed])
|
||||||
|
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
|
||||||
22
apache-commons-daemon-secondary.patch
Normal file
22
apache-commons-daemon-secondary.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
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*)
|
||||||
|
- 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\\\""
|
||||||
80
apache-commons-daemon.spec
Normal file
80
apache-commons-daemon.spec
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
Name: apache-commons-daemon
|
||||||
|
Version: 1.3.3
|
||||||
|
Release: 2
|
||||||
|
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
|
||||||
|
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
|
||||||
|
|
||||||
|
%description
|
||||||
|
The scope of this package is to define an API in line with the current Java Platform APIs to support
|
||||||
|
an alternative invocation mechanism which could be used instead of the public static void main(String[]) method.
|
||||||
|
This specification covers the behavior and life cycle of what we define as Java daemons, or, in other words, non interactive Java applications.
|
||||||
|
|
||||||
|
%package help
|
||||||
|
Requires: jpackage-utils
|
||||||
|
BuildArch: noarch
|
||||||
|
Summary: Help documents for apache-commons-daemon
|
||||||
|
Provides: apache-commons-daemon-javadoc = %{version}-%{release}
|
||||||
|
Obsoletes: apache-commons-daemon-javadoc < %{version}-%{release}
|
||||||
|
|
||||||
|
%description help
|
||||||
|
The apache-commons-daemon-help package conatins manual pages and API documents for apache-commons-daemon.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n commons-daemon-%{version}-src -p1
|
||||||
|
|
||||||
|
rm -rf src/samples/build/*
|
||||||
|
cd src/native/unix
|
||||||
|
xmlto man man/jsvc.1.xml
|
||||||
|
|
||||||
|
%build
|
||||||
|
cd src/native/unix
|
||||||
|
%configure --with-java=%{java_home}
|
||||||
|
make clean
|
||||||
|
%make_build
|
||||||
|
cd -
|
||||||
|
|
||||||
|
%mvn_file : commons-daemon apache-commons-daemon
|
||||||
|
%mvn_alias : org.apache.commons:commons-daemon
|
||||||
|
%mvn_build -f
|
||||||
|
|
||||||
|
%install
|
||||||
|
install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
|
||||||
|
install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
|
||||||
|
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%doc LICENSE.txt
|
||||||
|
%{_bindir}/jsvc
|
||||||
|
|
||||||
|
%files help -f .mfiles-javadoc
|
||||||
|
%doc PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples src/docs/*
|
||||||
|
%{_mandir}/man1/jsvc.1*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* 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.3.3-src.tar.gz
Normal file
BIN
commons-daemon-1.3.3-src.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user