diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2019-09-19 19:04:16 +0300 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2019-09-19 19:04:16 +0300 |
| commit | deb26fa47a9ab1b358938134a8ced8bbc4a083e1 (patch) | |
| tree | 0bedf8829f003fa4c0101e3421b7184acc1c8343 /pkg/rpm | |
| parent | fcb1f851d0b5d1774a6cb876288ea29cfef58618 (diff) | |
| parent | db777d1e7f607d1b0f01dfb73ad0bac12987202b (diff) | |
| download | unit-deb26fa47a9ab1b358938134a8ced8bbc4a083e1.tar.gz unit-deb26fa47a9ab1b358938134a8ced8bbc4a083e1.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'pkg/rpm')
| -rw-r--r-- | pkg/rpm/Makefile.jsc-common | 4 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.jsc11 | 3 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.jsc8 | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common index 9c7e9164..68d7721d 100644 --- a/pkg/rpm/Makefile.jsc-common +++ b/pkg/rpm/Makefile.jsc-common @@ -6,7 +6,9 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 2 -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 diff --git a/pkg/rpm/Makefile.jsc11 b/pkg/rpm/Makefile.jsc11 index 9f730ef2..522e0bf2 100644 --- a/pkg/rpm/Makefile.jsc11 +++ b/pkg/rpm/Makefile.jsc11 @@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc11= Java 11 module for NGINX Unit MODULE_VERSION_jsc11= $(VERSION) MODULE_RELEASE_jsc11= 2 -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 diff --git a/pkg/rpm/Makefile.jsc8 b/pkg/rpm/Makefile.jsc8 index 6c45cc52..59ba9b8d 100644 --- a/pkg/rpm/Makefile.jsc8 +++ b/pkg/rpm/Makefile.jsc8 @@ -6,7 +6,9 @@ MODULE_SUMMARY_jsc8= Java 8 module for NGINX Unit MODULE_VERSION_jsc8= $(VERSION) MODULE_RELEASE_jsc8= 2 -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 |