Control: severity -1 important
Dear maintainer,
I've uploaded an NMU for ghdl (versioned as 2.0.0+dfsg-6.1).
The diff is attached to this message.
cu
Adrian
diff -Nru ghdl-2.0.0+dfsg/debian/changelog ghdl-2.0.0+dfsg/debian/changelog
--- ghdl-2.0.0+dfsg/debian/changelog 2023-01-20 04:29:12.000000000 +0200
+++ ghdl-2.0.0+dfsg/debian/changelog 2023-02-10 18:49:58.000000000 +0200
@@ -1,3 +1,11 @@
+ghdl (2.0.0+dfsg-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Adjust the autopkgtest for the ghwdump move.
+ * Drop the gcc backend on armhf for now. (see #1010539)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 10 Feb 2023 18:49:58 +0200
+
ghdl (2.0.0+dfsg-6) unstable; urgency=medium
* Upload to unstable
diff -Nru ghdl-2.0.0+dfsg/debian/control ghdl-2.0.0+dfsg/debian/control
--- ghdl-2.0.0+dfsg/debian/control 2023-01-11 03:56:31.000000000 +0200
+++ ghdl-2.0.0+dfsg/debian/control 2023-02-10 18:49:58.000000000 +0200
@@ -26,7 +26,7 @@
Architecture: any
Depends: ghdl-common (= ${binary:Version}),
ghdl-mcode [any-i386 any-amd64] <!pkg.ghdl.nomcode>
- | ghdl-gcc <!pkg.ghdl.nogcc>
+ | ghdl-gcc [!armhf] <!pkg.ghdl.nogcc>
| ghdl-llvm <!pkg.ghdl.nollvm>,
${misc:Depends}
Suggests: gtkwave
@@ -79,7 +79,7 @@
This package contains the compiler with the mcode backend.
Package: ghdl-gcc
-Architecture: any
+Architecture: alpha amd64 arc arm64 armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
Build-Profiles: <!pkg.ghdl.nogcc>
Built-Using: ${Built-Using-GCC}
Depends: ghdl-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
diff -Nru ghdl-2.0.0+dfsg/debian/rules ghdl-2.0.0+dfsg/debian/rules
--- ghdl-2.0.0+dfsg/debian/rules 2023-01-20 04:10:35.000000000 +0200
+++ ghdl-2.0.0+dfsg/debian/rules 2023-02-10 18:49:58.000000000 +0200
@@ -38,6 +38,11 @@
BACKENDS := $(filter-out mcode,$(BACKENDS))
endif
+# https://bugs.debian.org/1010539
+ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)
+ BACKENDS := $(filter-out gcc,$(BACKENDS))
+endif
+
BUILDDIR := $(CURDIR)/builddir
TESTRUNDIR := $(CURDIR)/testrundir
STAMPSDIR := $(BUILDDIR)/stamps
diff -Nru ghdl-2.0.0+dfsg/debian/tests/control ghdl-2.0.0+dfsg/debian/tests/control
--- ghdl-2.0.0+dfsg/debian/tests/control 2023-01-04 02:36:14.000000000 +0200
+++ ghdl-2.0.0+dfsg/debian/tests/control 2023-02-10 18:49:58.000000000 +0200
@@ -1,11 +1,11 @@
Test-Command: debian/tests/ghdl-tests autopkgtest gcc
-Depends: ghdl-gcc
+Depends: ghdl-gcc, ghdl-tools
Restrictions: skip-not-installable
Test-Command: debian/tests/ghdl-tests autopkgtest llvm
-Depends: ghdl-llvm
+Depends: ghdl-llvm, ghdl-tools
Restrictions: skip-not-installable
Test-Command: debian/tests/ghdl-tests autopkgtest mcode
-Depends: ghdl-mcode, gcc, libc6-dev
+Depends: ghdl-mcode, gcc, libc6-dev, ghdl-tools
Restrictions: skip-not-installable
diff -Nru ghdl-2.0.0+dfsg/debian/tests/ghdl-tests ghdl-2.0.0+dfsg/debian/tests/ghdl-tests
--- ghdl-2.0.0+dfsg/debian/tests/ghdl-tests 2023-01-10 05:26:00.000000000 +0200
+++ ghdl-2.0.0+dfsg/debian/tests/ghdl-tests 2023-02-10 18:49:58.000000000 +0200
@@ -22,19 +22,9 @@
RUNDIR=testrundir/$BACKEND
mkdir -p "$RUNDIR"
GHDL="$PWD/$RUNDIR/usr/bin/ghdl-$BACKEND"
- GHWDUMP=
elif [ "$1" = autopkgtest ]; then
RUNDIR="$AUTOPKGTEST_TMP"
GHDL=/usr/bin/ghdl-$BACKEND
-
- # Check for temporary location of up to date ghwdump for autopkgtests
- # where it can be found until /usr/bin/ghwdump can be replaced in
- # coordination with the gtkwave package
- if [ -x /usr/lib/ghdl/ghwdump ]; then
- GHWDUMP=/usr/lib/ghdl/ghwdump
- else
- GHWDUMP=
- fi
else
echo >&2 "Invalid test environment specification"
exit 1
@@ -52,5 +42,5 @@
mkdir -p "$RUNDIR/src"
cp -r src/grt "$RUNDIR/src"
-export GHDL GHWDUMP
+export GHDL
(cd "$RUNDIR/testsuite"; ./testsuite.sh $TESTS -- --keep-going)
