From 327ac04aacd2fb088672cdb081dbea06421d7587 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 19 Apr 2024 09:47:15 +1100 Subject: [PATCH 1/3] openjdk 21.0.3 --- recipe/meta.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 52add30..79ad0e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "21.0.2" %} -{% set openjdk_revision = "13" %} -{% set zulu_build = "21.32.17-ca" %} +{% set version = "21.0.3" %} +{% set openjdk_revision = "9" %} +{% set zulu_build = "21.34.19-ca" %} {% set major = version.split(".")[0] %} {% set jdk_full = version ~ "+" ~ openjdk_revision %} @@ -21,7 +21,7 @@ source: # example of full url for version=17.0.8 & openjdk_revision=7: # https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.8_7.tar.gz - url: {{ temurin_url }}/{{ temurin_base }}_x64_{{ temurin_suffix }} # [build_platform == "linux-64"] - sha256: 454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5 # [build_platform == "linux-64"] + sha256: fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340 # [build_platform == "linux-64"] # native compilation: currently unused - url: {{ temurin_url }}/{{ temurin_base }}_aarch64_{{ temurin_suffix }} # [build_platform == "linux-aarch64"] sha256: 980156d37580bd6fec142e02900497984e94c4b819a0c0eb7ce790bfc7c7d920 # [build_platform == "linux-aarch64"] @@ -29,7 +29,7 @@ source: sha256: 45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded # [build_platform == "linux-ppc64le"] - url: https://github.com/openjdk/jdk{{ major }}u/archive/refs/tags/jdk-{{ jdk_full }}.tar.gz # [linux] - sha256: 4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26 # [linux] + sha256: b7a78e596b272d958843eab0c0412fd7ee874a3b6fff577584ebeed39dfef7ee # [linux] folder: src # [linux] - url: https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-fonts-ttf-2.37.zip # [linux] sha256: 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a # [linux] @@ -38,14 +38,14 @@ source: # example of full url for zulu_build=17.44.15-ca & version=17.0.8: # https://cdn.azul.com/zulu/bin/zulu17.44.15-ca-jdk17.0.8-macosx_x64.zip - url: {{ zulu_url }}/{{ zulu_base }}-macosx_x64.zip # [osx and x86_64] - sha256: 1fde3ae20ad28f9a1820524d7699f4a349382af1dc7d339f27acc75ca0dd27ab # [osx and x86_64] + sha256: f63ce937aac830e5fe4575cac4ffa4311d11b0bd30dbce0b59fa6b914211025d # [osx and x86_64] - url: {{ zulu_url }}/{{ zulu_base }}-macosx_aarch64.zip # [osx and arm64] - sha256: b7131bfe20d258fee795b2a175821fca697aa90a8b34db303bbe364957de6ff7 # [osx and arm64] + sha256: 2736a79f441ed63890414a661d82eec7abd653c57fd4e0f36d1dd4c6bb351b0f # [osx and arm64] - url: {{ zulu_url }}/{{ zulu_base }}-win_x64.zip # [win64] - sha256: f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de # [win64] + sha256: fb9f0dc6a484b0b169b3b3a3c2425d5f62bebfd15cb06c1597e33f77959c72af # [win64] build: - number: 1 + number: 0 requirements: build: From 52c2cb79eb318ccca36c14e7bc28c24f4b6e56e1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 19 Apr 2024 09:47:26 +1100 Subject: [PATCH 2/3] add myself to maintainers --- .github/CODEOWNERS | 2 +- README.md | 1 + recipe/meta.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index df69eb5..f38a310 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @CJ-Wright @izahn @johanneskoester @mingwandroid @sodre @xhochy \ No newline at end of file +* @CJ-Wright @h-vetinari @izahn @johanneskoester @mingwandroid @sodre @xhochy \ No newline at end of file diff --git a/README.md b/README.md index 2c1acf5..4e93df9 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,7 @@ Feedstock Maintainers ===================== * [@CJ-Wright](https://github.com/CJ-Wright/) +* [@h-vetinari](https://github.com/h-vetinari/) * [@izahn](https://github.com/izahn/) * [@johanneskoester](https://github.com/johanneskoester/) * [@mingwandroid](https://github.com/mingwandroid/) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 79ad0e4..7f021ea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -140,3 +140,4 @@ extra: - CJ-Wright - xhochy - izahn + - h-vetinari From b72a23d823edeaef78756aa66155fa1281a24620 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 19 Apr 2024 09:52:36 +1100 Subject: [PATCH 3/3] add stdlib (where we're compiling ourselves) --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7f021ea..d8ca27f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -51,6 +51,7 @@ requirements: build: # We also need a compiler on osx to produce correct signatures - {{ compiler('cxx') }} # [not win] + - {{ stdlib('c') }} # [linux] - pkg-config # [linux] - autoconf # [linux] - unzip # [linux]