From 1606cd90e7e79df8f94b3f004eb0580a45098b29 Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Thu, 28 May 2026 00:16:28 +0000 Subject: [PATCH] fix(qdbm): disable Java bindings AZL does not ship java21-openjdk. Override %java_arches to 'noarch' via build.defines so all %ifarch %java_arches blocks are skipped, cleanly disabling the qdbm-java and qdbm-javadoc subpackages. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- base/comps/components.toml | 1 - base/comps/qdbm/qdbm.comp.toml | 5 +++++ locks/qdbm.lock | 2 +- specs/q/qdbm/qdbm.azl.macros | 3 +++ specs/q/qdbm/qdbm.spec | 6 +++++- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 base/comps/qdbm/qdbm.comp.toml create mode 100644 specs/q/qdbm/qdbm.azl.macros diff --git a/base/comps/components.toml b/base/comps/components.toml index e460cc32019..c6ef98df84f 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -4415,7 +4415,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min [components.qca] [components.qcoro] [components.qcustomplot] -[components.qdbm] [components.qdox] [components.qhull] [components.qjson] diff --git a/base/comps/qdbm/qdbm.comp.toml b/base/comps/qdbm/qdbm.comp.toml new file mode 100644 index 00000000000..8d499aaf612 --- /dev/null +++ b/base/comps/qdbm/qdbm.comp.toml @@ -0,0 +1,5 @@ +# AZL does not ship java21-openjdk — disable Java bindings. +# The spec gates all Java support on %ifarch %java_arches, so redefining +# that macro to an impossible arch disables it cleanly. +[components.qdbm] +build.defines = { java_arches = "noarch" } diff --git a/locks/qdbm.lock b/locks/qdbm.lock index e0a10be847b..864b2ebc706 100644 --- a/locks/qdbm.lock +++ b/locks/qdbm.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '7dd215ee2c27cffa0024c64e94d0aa5ecf47f502' upstream-commit = '7dd215ee2c27cffa0024c64e94d0aa5ecf47f502' -input-fingerprint = 'sha256:5b66a0f6618f71c7aee0da393af0275b3e301c584f4e818798d4cefeaed1f69d' +input-fingerprint = 'sha256:3c2564b0b6de54a8ab7838dc168434d6829b931b230c372bf27adfc637d18f9e' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/q/qdbm/qdbm.azl.macros b/specs/q/qdbm/qdbm.azl.macros new file mode 100644 index 00000000000..cfe89d2ed0e --- /dev/null +++ b/specs/q/qdbm/qdbm.azl.macros @@ -0,0 +1,3 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%java_arches noarch diff --git a/specs/q/qdbm/qdbm.spec b/specs/q/qdbm/qdbm.spec index e3125e8cb5d..a58292023c1 100644 --- a/specs/q/qdbm/qdbm.spec +++ b/specs/q/qdbm/qdbm.spec @@ -1,6 +1,9 @@ # This spec file has been modified by azldev to include build configuration overlays. # Do not edit manually; changes may be overwritten. +# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added. +%{load:%{_sourcedir}/qdbm.azl.macros} + %define set_javaver() \ %if 0%{?fedora}%{?rhel} == %1 \ BuildRequires: java-%2-openjdk-devel \ @@ -12,12 +15,13 @@ BuildRequires: javapackages-local-openjdk%2 \ Name: qdbm Version: 1.8.78 -Release: 72%{?dist} +Release: 73%{?dist} # SPDX confirmed License: LGPL-2.1-or-later URL: http://fallabs.com/qdbm/ Source0: http://fallabs.com/qdbm/%{name}-%{version}.tar.gz +Source9999: qdbm.azl.macros # Copied from Debian package Patch0: qdbm-ruby-1.9-compat.patch # Java 13 introduced yield keyword and the original yield()