Source: ghdl
Followup-For: Bug #1100461
Control: tags -1 + patch
Hello.
I suggest to remove the dependency on dh-ada-library and duplicate the definitions of ADAFLAGS and GNATMAKEFLAGS.
Anyway, DEB_GNAT_VERSION must be read from the ghdl debian/control
file, but not from /usr/bin/gnatmake which may differ or be missing.
I would like to NMU the attached changes in a few days because this
bug blocks the gnat transition.
From ad493c3f4d1c60c4fe9ac4930906c495b408928d Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <
nicolas@debian.org>
Date: Sun, 23 Mar 2025 19:19:53 +0100
Subject: [PATCH 1/2] Remove dh-ada-library from build-dependencies. Closes:
#1100461
---
debian/control | 1 -
debian/rules | 22 +++++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index b51b9263..25b476fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian Electronics Team <
pkg-electronics-devel@lists.alioth.debian.org>
Uploaders: Andreas Bombe <
aeb@debian.org>
Build-Depends: debhelper-compat (= 13),
- dh-ada-library (>= 8.1),
gnat-13, gcc-13, g++-13,
gcc-13-source <!pkg.ghdl.nogcc>,
libisl-dev (>= 0.14) <!pkg.ghdl.nogcc>,
diff --git a/debian/rules b/debian/rules
index 5611b4e2..5452d4a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,27 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-format
#export DH_VERBOSE = 1
include /usr/share/dpkg/default.mk
-include /usr/share/ada/packaging.mk
+
+# Ghdl build-depends on a gnat version that may differ from the
+# default Ada