diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
| commit | d8acad350a52a20918c46c09cb0a0f5479400923 (patch) | |
| tree | 7d9c4b64daa60d3ac121743dfa3735c6fc5687a4 /pkg/rpm/Makefile.jsc17 | |
| parent | 624debcf17ea7faab01fa841bd4dcd9f308cf306 (diff) | |
| parent | 27bde184dedcbf687db2f314c60c037623318a8d (diff) | |
| download | unit-d8acad350a52a20918c46c09cb0a0f5479400923.tar.gz unit-d8acad350a52a20918c46c09cb0a0f5479400923.tar.bz2 | |
Merge tag '1.34.0' into packaging1.34.0-1
Unit 1.34.0 release.
Diffstat (limited to 'pkg/rpm/Makefile.jsc17')
| -rw-r--r-- | pkg/rpm/Makefile.jsc17 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rpm/Makefile.jsc17 b/pkg/rpm/Makefile.jsc17 index 9a42c5a1..f22fbd24 100644 --- a/pkg/rpm/Makefile.jsc17 +++ b/pkg/rpm/Makefile.jsc17 @@ -8,7 +8,7 @@ MODULE_RELEASE_jsc17= 1 ifeq ($(OSVER),amazonlinux2023) MODULE_CONFARGS_jsc17= java --module=java17 --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_jsc17= java --module=java17 --home=/usr/lib/jvm/java-17-openjdk --lib-path=/usr/lib/jvm/java-17-openjdk/lib --jars=/usr/share/unit-jsc-common/ endif MODULE_MAKEARGS_jsc17= java17 @@ -19,7 +19,7 @@ MODULE_SOURCES_jsc17= unit.example-jsc-app \ ifeq ($(OSVER),amazonlinux2023) BUILD_DEPENDS_jsc17= java-17-amazon-corretto-devel -else ifeq ($(OSVER),fedora39) +else ifneq (,$(findstring $(OSVER),fedora40 fedora41)) BUILD_DEPENDS_jsc17= java-17-openjdk-devel BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc17) endif |