diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2023-03-30 10:51:32 -0700 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2023-03-30 10:51:32 -0700 |
| commit | 497b84c18f6b903fc5cc5dd05c50e4648d2db777 (patch) | |
| tree | 87f467e03ac5429b4111c3d2436dd0408b08e390 | |
| parent | 219b8363a4653e99bd1051532f66be7a6583a30d (diff) | |
| download | unit-497b84c18f6b903fc5cc5dd05c50e4648d2db777.tar.gz unit-497b84c18f6b903fc5cc5dd05c50e4648d2db777.tar.bz2 | |
Packages: Used a stricter check for Amazon Linux 2023.
Previously, findstring matched on amazonlinux2 too, breaking the build on that OS.
| -rw-r--r-- | pkg/rpm/Makefile.jsc-common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common index ebacf69d..a3c3a3da 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/^.*= //') -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/ 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/ @@ -18,7 +18,7 @@ MODULE_INSTARGS_jsc_common= java-shared-install 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 else BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl |