phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Packages: added explicit library path for Java on RPM based distros.

Browse source 
This helps to avoid using excessive strictness in RPATH of Java modules.
This commit is contained in:
Andrei Belov 2019-09-16 13:28:06 +03:00
parent 2a6af1d214
commit 6f1f3b48b2
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/rpm/Makefile.jsc-common
View file

@ -6,7 +6,9 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit
MODULE_VERSION_jsc_common= $(VERSION)
MODULE_RELEASE_jsc_common= 1
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-1.8.0 --jars=/usr/share/unit-jsc-common/
JAVA_ARCH_jsc_common= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>&1 | grep -F -e os.arch | sed -e 's/^.*= //')
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-1.8.0 --lib-path=/usr/lib/jvm/jre-1.8.0/lib/$(JAVA_ARCH_jsc_common)/server --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc_common= java
MODULE_INSTARGS_jsc_common= java-shared-install

3
pkg/rpm/Makefile.jsc11
View file

@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc11= Java 11 module for NGINX Unit
MODULE_VERSION_jsc11= $(VERSION)
MODULE_RELEASE_jsc11= 1
MODULE_CONFARGS_jsc11= java --module=java11 --home=/usr/lib/jvm/java-11 --jars=/usr/share/unit-jsc-common/
MODULE_CONFARGS_jsc11= java --module=java11 --home=/usr/lib/jvm/java-11 --lib-path=/usr/lib/jvm/jre-11/lib/server --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc11= java11
MODULE_INSTARGS_jsc11= java11-install
@ -18,6 +18,7 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc11)
define MODULE_DEFINITIONS_jsc11
Requires: unit-jsc-common == $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)%{?dist}.ngx
Requires: java-11-headless
endef
export MODULE_DEFINITIONS_jsc11

5
pkg/rpm/Makefile.jsc8
View file

@ -6,7 +6,9 @@ MODULE_SUMMARY_jsc8= Java 8 module for NGINX Unit
MODULE_VERSION_jsc8= $(VERSION)
MODULE_RELEASE_jsc8= 1
MODULE_CONFARGS_jsc8= java --module=java8 --home=/usr/lib/jvm/java-1.8.0 --jars=/usr/share/unit-jsc-common/
JAVA_ARCH_jsc8= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>&1 | grep -F -e os.arch | sed -e 's/^.*= //')
MODULE_CONFARGS_jsc8= java --module=java8 --home=/usr/lib/jvm/java-1.8.0 --lib-path=/usr/lib/jvm/jre-1.8.0/lib/$(JAVA_ARCH_jsc8)/server --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc8= java8
MODULE_INSTARGS_jsc8= java8-install
@ -18,6 +20,7 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc8)
define MODULE_DEFINITIONS_jsc8
Requires: unit-jsc-common == $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)%{?dist}.ngx
Requires: java-1.8.0-headless
endef
export MODULE_DEFINITIONS_jsc8