technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: Used a stricter check for Amazon Linux 2023.

Browse Source 
Previously, findstring matched on amazonlinux2 too, breaking the build on that OS.
This commit is contained in:
Konstantin Pavlov
2023-03-30 10:51:32 -07:00
parent 219b8363a4
commit 497b84c18f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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/^.*= //') 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/^.*= //')
ifneq (,$(findstring $(OSVER),amazonlinux2023)) ifeq ($(OSVER),amazonlinux2023)
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-17-amazon-corretto --lib-path=/usr/lib/jvm/java-17-amazon-corretto/lib --jars=/usr/share/unit-jsc-common/ MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-17-amazon-corretto --lib-path=/usr/lib/jvm/java-17-amazon-corretto/lib --jars=/usr/share/unit-jsc-common/
else else
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_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/
@@ -18,7 +18,7 @@ MODULE_INSTARGS_jsc_common= java-shared-install
MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common
ifneq (,$(findstring $(OSVER),amazonlinux2023)) ifeq ($(OSVER),amazonlinux2023)
BUILD_DEPENDS_jsc_common= java-17-amazon-corretto-devel curl BUILD_DEPENDS_jsc_common= java-17-amazon-corretto-devel curl
else else
BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl