From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71D93C4332F for ; Thu, 18 Nov 2021 03:10:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5BC0861B49 for ; Thu, 18 Nov 2021 03:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242656AbhKRDNo (ORCPT ); Wed, 17 Nov 2021 22:13:44 -0500 Received: from dcvr.yhbt.net ([64.71.152.64]:40964 "EHLO dcvr.yhbt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242717AbhKRDNh (ORCPT ); Wed, 17 Nov 2021 22:13:37 -0500 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id B251C1FA10; Thu, 18 Nov 2021 03:10:16 +0000 (UTC) From: Eric Wong To: io-uring@vger.kernel.org Cc: Liu Changcheng , Stefan Metzmacher Subject: [PATCH v2 3/7] debian/rules: fix for newer debhelper Date: Thu, 18 Nov 2021 03:10:12 +0000 Message-Id: <20211118031016.354105-4-e@80x24.org> In-Reply-To: <20211118031016.354105-1-e@80x24.org> References: <20211118031016.354105-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org When testing on my Debian 11.x (stable) system, --add-udeb causes the following build error: dh_makeshlibs: error: The udeb liburing1-udeb does not contain any shared librar ies but --add-udeb=liburing1-udeb was passed!? make: *** [debian/rules:82: binary-arch] Error 255 Reading the current dh_makeshlibs(1) manpage reveals --add-udeb is nowadays implicit as of debhelper 12.3 and no longer necessary. Compatibility with older debhelper on Debian oldstable (buster) remains intact. Tested with debhelper 12.1.1 on Debian 10.x (buster) and debhelper 13.3.4 on Debian 11.x (bullseye). Signed-off-by: Eric Wong --- debian/rules | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1a334b3..fe90606 100755 --- a/debian/rules +++ b/debian/rules @@ -70,7 +70,14 @@ binary-arch: install-arch dh_strip -a --ddeb-migration='$(libdbg) (<< 0.3)' dh_compress -a dh_fixperms -a - dh_makeshlibs -a --add-udeb '$(libudeb)' + +# --add-udeb is needed for < 12.3, and breaks with auto-detection +# on debhelper 13.3.4, at least + if perl -MDebian::Debhelper::Dh_Version -e \ + 'exit(eval("v$$Debian::Debhelper::Dh_Version::version") lt v12.3)'; \ + then dh_makeshlibs -a; else \ + dh_makeshlibs -a --add-udeb '$(libudeb)'; fi + dh_shlibdeps -a dh_installdeb -a dh_gencontrol -a