From 16b99f8d7f1a6ee6b3c7982d65f193f92a08bf34 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 17 May 2024 13:54:17 -0700 Subject: [PATCH] jmods for 12-16, correct configure flags. Signed-off-by: Ville Aikas --- openjdk-12.yaml | 11 ++++++++++- openjdk-13.yaml | 11 ++++++++++- openjdk-14.yaml | 11 ++++++++++- openjdk-15.yaml | 8 +++++++- openjdk-16.yaml | 11 ++++++++++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/openjdk-12.yaml b/openjdk-12.yaml index 8648078aca..bc698c23e4 100644 --- a/openjdk-12.yaml +++ b/openjdk-12.yaml @@ -1,7 +1,7 @@ package: name: openjdk-12 version: 12.0.2.10 - epoch: 2 + epoch: 3 description: copyright: - license: GPL-2.0-only @@ -60,9 +60,15 @@ pipeline: - runs: chmod +x configure + # Note that despite using --with-extra-cflags, --with-extra-cxxflags, and + # --with-extra-ldflags, the configure still produces warnings like: + # https://github.com/wolfi-dev/os/issues/18747 - uses: autoconf/configure with: opts: | + --with-extra-cflags="$CFLAGS" \ + --with-extra-cxxflags="$CXXFLAGS" \ + --with-extra-ldflags="$LDFLAGS" \ --with-boot-jdk=/usr/lib/jvm/java-11-openjdk \ --prefix=/usr/lib/jvm/java-12-openjdk \ --with-vendor-name=wolfi \ @@ -179,6 +185,9 @@ subpackages: - name: "openjdk-12-jmods" description: "OpenJDK 12 jmods" + dependencies: + provides: + - openjdk-jmods=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/jvm/java-12-openjdk diff --git a/openjdk-13.yaml b/openjdk-13.yaml index b4e6f3a572..3776cd4ae6 100644 --- a/openjdk-13.yaml +++ b/openjdk-13.yaml @@ -1,7 +1,7 @@ package: name: openjdk-13 version: 13.0.14.5 - epoch: 2 + epoch: 3 description: copyright: - license: GPL-2.0-only @@ -57,9 +57,15 @@ pipeline: - runs: chmod +x configure + # Note that despite using --with-extra-cflags, --with-extra-cxxflags, and + # --with-extra-ldflags, the configure still produces warnings like: + # https://github.com/wolfi-dev/os/issues/18747 - uses: autoconf/configure with: opts: | + --with-extra-cflags="$CFLAGS" \ + --with-extra-cxxflags="$CXXFLAGS" \ + --with-extra-ldflags="$LDFLAGS" \ --with-boot-jdk=/usr/lib/jvm/java-12-openjdk \ --prefix=/usr/lib/jvm/java-13-openjdk \ --with-vendor-name=wolfi \ @@ -175,6 +181,9 @@ subpackages: - name: "openjdk-13-jmods" description: "OpenJDK 13 jmods" + dependencies: + provides: + - openjdk-jmods=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/jvm/java-13-openjdk diff --git a/openjdk-14.yaml b/openjdk-14.yaml index 9e6907296f..960e103477 100644 --- a/openjdk-14.yaml +++ b/openjdk-14.yaml @@ -1,7 +1,7 @@ package: name: openjdk-14 version: 14.0.2.12 - epoch: 4 + epoch: 5 description: copyright: - license: GPL-2.0-only @@ -57,9 +57,15 @@ pipeline: - runs: chmod +x configure + # Note that despite using --with-extra-cflags, --with-extra-cxxflags, and + # --with-extra-ldflags, the configure still produces warnings like: + # https://github.com/wolfi-dev/os/issues/18747 - uses: autoconf/configure with: opts: | + --with-extra-cflags="$CFLAGS" \ + --with-extra-cxxflags="$CXXFLAGS" \ + --with-extra-ldflags="$LDFLAGS" \ --with-boot-jdk=/usr/lib/jvm/java-13-openjdk \ --prefix=/usr/lib/jvm/java-14-openjdk \ --with-vendor-name=wolfi \ @@ -170,6 +176,9 @@ subpackages: - name: "openjdk-14-jmods" description: "OpenJDK 14 jmods" + dependencies: + provides: + - openjdk-jmods=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/jvm/java-14-openjdk diff --git a/openjdk-15.yaml b/openjdk-15.yaml index b6d94f1726..80bdda4109 100644 --- a/openjdk-15.yaml +++ b/openjdk-15.yaml @@ -1,7 +1,7 @@ package: name: openjdk-15 version: 15.0.10.5 - epoch: 4 + epoch: 5 description: copyright: - license: GPL-2.0-only @@ -64,6 +64,9 @@ pipeline: - runs: chmod +x configure + # Note that despite using --with-extra-cflags, --with-extra-cxxflags, and + # --with-extra-ldflags, the configure still produces warnings like: + # https://github.com/wolfi-dev/os/issues/18747 - uses: autoconf/configure with: opts: | @@ -177,6 +180,9 @@ subpackages: - name: "openjdk-15-jmods" description: "OpenJDK 15 jmods" + dependencies: + provides: + - openjdk-jmods=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/jvm/java-15-openjdk diff --git a/openjdk-16.yaml b/openjdk-16.yaml index 60b8dc2f56..4489a650e6 100644 --- a/openjdk-16.yaml +++ b/openjdk-16.yaml @@ -1,7 +1,7 @@ package: name: openjdk-16 version: 16.0.2.7 - epoch: 4 + epoch: 5 description: copyright: - license: GPL-2.0-only @@ -64,9 +64,15 @@ pipeline: - runs: chmod +x configure + # Note that despite using --with-extra-cflags, --with-extra-cxxflags, and + # --with-extra-ldflags, the configure still produces warnings like: + # https://github.com/wolfi-dev/os/issues/18747 - uses: autoconf/configure with: opts: | + --with-extra-cflags="$CFLAGS" \ + --with-extra-cxxflags="$CXXFLAGS" \ + --with-extra-ldflags="$LDFLAGS" \ --with-boot-jdk=/usr/lib/jvm/java-15-openjdk \ --prefix=/usr/lib/jvm/java-16-openjdk \ --with-vendor-name=wolfi \ @@ -177,6 +183,9 @@ subpackages: - name: "openjdk-16-jmods" description: "OpenJDK 16 jmods" + dependencies: + provides: + - openjdk-jmods=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/jvm/java-16-openjdk