openkylin
/
java-common
mirror of https://gitee.com/openkylin/java-common.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!2 if arch =rv64g default-java dh_link to openjdk*-riscv64 

Merge pull request !2 from 范小气/openkylin/yangtze
This commit is contained in:
周淦清 2024-03-15 01:29:00 +00:00 committed by Gitee
parent ff1d8d0f6c 15d7e997b9
commit 8fcd87b963
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
java-common (0.72-ok4) yangtze; urgency=medium
* if arch =rv64g default-java dh_link to openjdk*-riscv64
-- root <fanxiaoqi@smart-core.cn> Thu, 14 Mar 2024 10:27:36 +0000
java-common (0.72-ok3) yangtze; urgency=medium
* Add support for rv64g.

6
debian/rules vendored
View File

@ -12,6 +12,10 @@ jhl_provides = java-runtime-headless, java2-runtime-headless, $(shell seq --form
jdk_provides = java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version))
jdkhl_provides = java-sdk-headless, java2-sdk-headless, $(shell seq --format java%.f-sdk-headless --separator ', ' 5 $(java_default_version))
arch=$(DEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH),rv64g)
arch=riscv64
endif
%:
dh $@
@ -20,7 +24,7 @@ override_dh_link:
dh_link
# Link /usr/lib/jvm/default-java to the default JRE
dh_link -pdefault-jre-headless usr/lib/jvm/java-1.$(java_default_version).0-openjdk-$(DEB_HOST_ARCH) usr/lib/jvm/default-java
dh_link -pdefault-jre-headless usr/lib/jvm/java-1.$(java_default_version).0-openjdk-$(arch) usr/lib/jvm/default-java
# Link to the JDK documentation
dh_link -pdefault-jdk-doc /usr/share/doc/openjdk-$(java_default_version)-doc/api usr/share/doc/default-jre-headless/api