Control: tags -1 + patch

On Fri, 20 Aug 2021 at 15:50:10 +0100, Simon McVittie wrote:
> This appears to have been caused by trying to fix the Lintian breakout-link
> warning, which is an endless source of false-positives[1][2], in commit
> 7c408ba0[3].
> 
> For now, please revert that commit. I can NMU with a revert if necessary?

A simple revert of 7c408ba0 seems to do the right thing. The Lintian
warning comes back, but honestly I think that Lintian tag does more harm
than good, so ignoring or overriding it seems proportionate.

MR: https://salsa.debian.org/debian/libgpg-error/-/merge_requests/3
or see attached.

    smcv
>From 64338854c467c26bfe09d3658739174e4e0548ae Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Fri, 20 Aug 2021 17:25:46 +0100
Subject: [PATCH] Revert "libgpg-error-dev: fix breakout-link warning (thanks,
 lintian!)"

This change resulted in /usr/lib/*/libgpg-error.so being a dangling
symlink on non-merged-/usr systems, notably all official buildd chroots,
causing linking to the shared library to fail. For shared libraries that
depend on libgpg-error, falling back to the static library also fails,
because it isn't PIC, causing build failure.

This reverts commit 7c408ba0968c14492b6f087c57c6d44af4878de6.

Closes: #992573
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 9e79648..2e2071b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,9 @@ override_dh_installchangelogs:
 override_dh_installdocs:
 	dh_installdocs -A README
 
+override_dh_link:
+	dh_link -plibgpg-error-dev lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so.0 usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so
+
 ### "arch-independent" Windows builds: ###
 
 WIN_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp" CFLAGS="-g -Os -fdebug-prefix-map=$(shell pwd)=." CPPFLAGS=
-- 
2.33.0

Reply via email to