summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorTiago Natel de Moura <t.nateldemoura@f5.com>2020-05-28 17:04:00 +0100
committerTiago Natel de Moura <t.nateldemoura@f5.com>2020-05-28 17:04:00 +0100
commitd3ca5fb47a52322b48737d21d55bf1d6d0aa446a (patch)
treec316e9afc9af01ab4c24bb304886211fee6660e6 /pkg
parent9d8e476c4e3695019b0a1fe3696d3411a8393de6 (diff)
downloadunit-d3ca5fb47a52322b48737d21d55bf1d6d0aa446a.tar.gz
unit-d3ca5fb47a52322b48737d21d55bf1d6d0aa446a.tar.bz2
Packages: fixed java configure script.1.18.0
Now the configure script appends /server to --lib-path argument.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/rpm/Makefile.jsc-common2
-rw-r--r--pkg/rpm/Makefile.jsc112
-rw-r--r--pkg/rpm/Makefile.jsc82
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common
index 959c6b9d..9688e265 100644
--- a/pkg/rpm/Makefile.jsc-common
+++ b/pkg/rpm/Makefile.jsc-common
@@ -8,7 +8,7 @@ MODULE_RELEASE_jsc_common= 1
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_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) --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 38efa2a9..ad2e96a4 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= 1
-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_CONFARGS_jsc11= java --module=java11 --home=/usr/lib/jvm/java-11 --lib-path=/usr/lib/jvm/jre-11/lib --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc11= java11
MODULE_INSTARGS_jsc11= java11-install
diff --git a/pkg/rpm/Makefile.jsc8 b/pkg/rpm/Makefile.jsc8
index 58e2368b..782cea3a 100644
--- a/pkg/rpm/Makefile.jsc8
+++ b/pkg/rpm/Makefile.jsc8
@@ -8,7 +8,7 @@ MODULE_RELEASE_jsc8= 1
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_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) --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc8= java8
MODULE_INSTARGS_jsc8= java8-install