From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx009.vodafonemail.xion.oxcs.net (mx009.vodafonemail.xion.oxcs.net [153.92.174.39]) by sourceware.org (Postfix) with ESMTPS id DB12D3851C12 for ; Wed, 3 Jun 2020 11:51:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DB12D3851C12 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=nexgo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Stromeko@nexgo.de Received: from vsmx002.vodafonemail.xion.oxcs.net (unknown [192.168.75.192]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTP id CB883604277 for ; Wed, 3 Jun 2020 11:51:37 +0000 (UTC) Received: from Gertrud (unknown [91.47.56.99]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTPA id A0B6C604B81 for ; Wed, 3 Jun 2020 11:51:35 +0000 (UTC) From: Achim Gratz To: cygwin-apps@cygwin.com Subject: [PATCH] cygport: suppress spurious package dependencies Date: Wed, 03 Jun 2020 13:51:34 +0200 Message-ID: <87367cv03d.fsf@Rainer.invalid> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-VADE-STATUS: LEGIT X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 11:51:40 -0000 --=-=-= Content-Type: text/plain The automatically generated dependencies sometimes have unwanted components. This patch allows to suppress these on a per-package basis, rather than requiring to patch the generated hint files after the fact. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-pkg_pkg-allow-suppression-of-spurious-package-depend.patch >From 009dbf010418afb873a75bdb204d77fdf1f83ac7 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 3 Jun 2020 13:41:18 +0200 Subject: [PATCH] pkg_pkg: allow suppression of spurious package dependencies Allow suppression of spurious automatic package dependencies by introducing a new variable PKG_REQUIRES_SUPPRESS, containing a single-line string of space-separated package list. Any of the packages listed are automatically determined to be a requirement are suppressed so that they do not show up in the generated hint file(s). --- lib/pkg_pkg.cygpart | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart index 7189f36..9603c1d 100644 --- a/lib/pkg_pkg.cygpart +++ b/lib/pkg_pkg.cygpart @@ -1,3 +1,4 @@ +# -*- mode: sh; sh-shell: bash -*- ################################################################################ # # pkg_pkg.cygpart - cygport packaging functions @@ -787,6 +788,7 @@ __pkg_dist() { do pkg_category_var=${pkg_name[${n}]//[-+\.]/_}_CATEGORY; pkg_requires_var=${pkg_name[${n}]//[-+\.]/_}_REQUIRES; + pkg_requires_suppress_var=${pkg_name[${n}]//[-+\.]/_}_REQUIRES_SUPPRESS; pkg_summary_var=${pkg_name[${n}]//[-+\.]/_}_SUMMARY; pkg_description_var=${pkg_name[${n}]//[-+\.]/_}_DESCRIPTION; pkg_message_var=${pkg_name[${n}]//[-+\.]/_}_MESSAGE; @@ -806,6 +808,10 @@ __pkg_dist() { then declare ${pkg_requires_var}="${REQUIRES}" fi + if [ -z "${distsubdir}${!pkg_requires_suppress_var}" -a -n "${REQUIRES_SUPPRESS+yes}" ] + then + declare ${pkg_requires_var}="${REQUIRES_SUPPRESS}" + fi if [ -z "${distsubdir}${!pkg_obsoletes_var}" -a -n "${OBSOLETES+yes}" ] then declare ${pkg_obsoletes_var}="${OBSOLETES}" @@ -827,9 +833,11 @@ __pkg_dist() { then if [ "${CBUILD##*-}" = "cygwin" ] then - pkg_bin_requires=$(__list_deps $(sort -fu ${T}/.${pkg_name[${n}]}.lst | sed -e '\|/$|d;s| |^_^|g') \ - | sed -e "/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \ - | sort -fu | sed -e ':a;N;$!ba;s/\n/ /g' ) + pkg_bin_requires=$( echo ${!pkg_requires_suppress_var} ${!pkg_requires_suppress_var} \ + $(__list_deps $(sort -fu ${T}/.${pkg_name[${n}]}.lst | sed -e '\|/$|d;s| |^_^|g') \ + | sed -e "/^${pkg_name[${n}]}-[0-9].*$/d;s/-[0-9].*$//g" \ + | sort -fu | sed -e ':a;N;$!ba;s/\n/ /g' ) \ + | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ' ) __step "${pkg_name[${n}]} requires: ${pkg_bin_requires} ${!pkg_requires_var}" else pkg_bin_requires= -- 2.26.2 --=-=-= Content-Type: text/plain Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra --=-=-=--