diff options
| author | Andrei Belov <defan@nginx.com> | 2020-05-28 19:16:25 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-05-28 19:16:25 +0300 |
| commit | ad414c01e747cab419c9c70df1fdbdf3c3aad251 (patch) | |
| tree | 38c285ee74cfedc11de16b886160eb9708907b42 | |
| parent | 7786ae258e689b4be83647cea4be5f19c3369f31 (diff) | |
| parent | d3ca5fb47a52322b48737d21d55bf1d6d0aa446a (diff) | |
| download | unit-1.18.0-1.tar.gz unit-1.18.0-1.tar.bz2 | |
Merged with the default branch.1.18.0-1
| -rw-r--r-- | auto/modules/java | 4 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.jsc-common | 2 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.jsc11 | 2 | ||||
| -rw-r--r-- | pkg/rpm/Makefile.jsc8 | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/auto/modules/java b/auto/modules/java index 2e6f292d..a3b1b958 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -172,12 +172,12 @@ if [ -z "$NXT_JAVA_LIB_PATH" ]; then exit 1 fi - NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server" - $echo " $NXT_JAVA_LIB_PATH" $echo "got library path $NXT_JAVA_LIB_PATH" >> $NXT_AUTOCONF_ERR fi +NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server" + NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath ${NXT_JAVA_LIB_SERVER_PATH} -ljvm" 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 |