mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-10-25 15:45:58 +01:00
fix(aur): build the source packages' launcher with Temurin (#150)
The kst4contest and kst4contest-git packages built jpackage's launcher with Arch's openjdk, which links libapplauncher.so against the shared libstdc++. That build aborts now and then on exit with "pure virtual method called" in a static destructor (SIGABRT, core dump), the failure Debian describes for non-static libstdc++ builds. Temurin links libstdc++ statically, like the CI-built packages. Both PKGBUILDs now fetch a pinned Temurin 21.0.13+9 through source_x86_64, so aur-publish.yml's rewrite of the sha256sums= line leaves it alone, and point the Gradle toolchain at it alone. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
738ae2125e
commit
f165f7d303
2 files changed
+37
-6
No files matched your search
@@ -7,12 +7,22 @@ arch=('x86_64')
|
||||
url="https://github.com/HamRadioOnline/kst4contest"
|
||||
license=('GPL-3.0-only')
|
||||
depends=('gst-plugins-base' 'gst-plugins-good')
|
||||
makedepends=('java-environment=21' 'git')
|
||||
makedepends=('git')
|
||||
provides=('kst4contest')
|
||||
conflicts=('kst4contest' 'kst4contest-bin')
|
||||
source=("kst4contest::git+https://github.com/HamRadioOnline/kst4contest.git")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
# The launcher is built with Temurin, not with the system JDK. Arch's openjdk links
|
||||
# jpackage's launcher library against the shared libstdc++, and that build aborts
|
||||
# with "pure virtual method called" (SIGABRT, core dump) in a static destructor when
|
||||
# the application exits; Temurin links libstdc++ statically, like the CI packages.
|
||||
# The _x86_64 arrays are deliberate: aur-publish.yml rewrites the plain sha256sums=
|
||||
# line on every release and would drop a second entry there.
|
||||
_temurin=21.0.13+9
|
||||
source_x86_64=("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${_temurin/+/%2B}/OpenJDK21U-jdk_x64_linux_hotspot_${_temurin/+/_}.tar.gz")
|
||||
sha256sums_x86_64=('d7f5d5cf865a2902b70ff549b97586a7d3f234e016f041ab447ea740c7d66d1c')
|
||||
|
||||
pkgver() {
|
||||
cd "${srcdir}/kst4contest"
|
||||
BASE=$(grep -m1 '^version=' gradle.properties \
|
||||
@@ -23,7 +33,7 @@ pkgver() {
|
||||
build() {
|
||||
cd "${srcdir}/kst4contest"
|
||||
|
||||
export JAVA_HOME=$(find /usr/lib/jvm -maxdepth 1 -name 'java-21-*' -type d | head -n 1)
|
||||
export JAVA_HOME="${srcdir}/jdk-${_temurin}"
|
||||
export PATH="${JAVA_HOME}/bin:${PATH}"
|
||||
|
||||
# A Gradle home inside $srcdir keeps the build independent of whatever the
|
||||
@@ -31,7 +41,13 @@ build() {
|
||||
# cache, every dependency added since the last local build broke the package.
|
||||
export GRADLE_USER_HOME="${srcdir}/gradle-home"
|
||||
|
||||
./gradlew --no-daemon -S :app-desktop:createDistributable
|
||||
# The Java toolchain, and with it jpackage, would otherwise pick any JDK 21 it
|
||||
# finds in /usr/lib/jvm, the system one included.
|
||||
./gradlew --no-daemon -S \
|
||||
-Porg.gradle.java.installations.auto-detect=false \
|
||||
-Porg.gradle.java.installations.auto-download=false \
|
||||
-Porg.gradle.java.installations.paths="${JAVA_HOME}" \
|
||||
:app-desktop:createDistributable
|
||||
|
||||
# package() reads dist/KST4Contest. Application name, icon and the JDK
|
||||
# module list come from app-desktop/build.gradle.kts.
|
||||
|
||||
Reference in new issue
Block a user