summaryrefslogtreecommitdiffhomepage
path: root/pkg/rpm/Makefile.jsc-common
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2024-11-21 18:32:28 -0800
committerKonstantin Pavlov <pavlov.konstantin@gmail.com>2024-12-12 19:13:30 -0800
commit19f403f5d015058399511af0fe3533899bbe506c (patch)
treebbdea448486aaec47e78bb06c1bd11509dab3dff /pkg/rpm/Makefile.jsc-common
parent655ca61b2b944396ff4b7ca174aa79a7b55db8bc (diff)
downloadunit-19f403f5d015058399511af0fe3533899bbe506c.tar.gz
unit-19f403f5d015058399511af0fe3533899bbe506c.tar.bz2
Packages: add Fedora 41 support
While at it, removed support for Fedora 39 as it's EOL.
Diffstat (limited to 'pkg/rpm/Makefile.jsc-common')
-rw-r--r--pkg/rpm/Makefile.jsc-common4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common
index f77ca1e9..ebea404f 100644
--- a/pkg/rpm/Makefile.jsc-common
+++ b/pkg/rpm/Makefile.jsc-common
@@ -10,7 +10,7 @@ JAVA_ARCH_jsc_common= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>
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 ifeq ($(OSVER),fedora39)
+else ifneq (,$(findstring $(OSVER),fedora40 fedora41))
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-17-openjdk --lib-path=/usr/lib/jvm/java-17-openjdk/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/
@@ -21,7 +21,7 @@ MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common
ifeq ($(OSVER),amazonlinux2023)
BUILD_DEPENDS_jsc_common= java-17-amazon-corretto-devel curl
-else ifeq ($(OSVER),fedora39)
+else ifneq (,$(findstring $(OSVER),fedora40 fedora41))
BUILD_DEPENDS_jsc_common= java-17-openjdk-devel curl
else
BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl