Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3A99384EEC for ; Fri, 17 Nov 2023 10:20:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wsElXhB51nKu for ; Fri, 17 Nov 2023 10:20:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8BAAB84EB4 for ; Fri, 17 Nov 2023 10:20:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7FC59FA3D; Fri, 17 Nov 2023 10:20:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700216425230520" MIME-Version: 1.0 Date: Fri, 17 Nov 2023 10:20:25 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/mk/configure To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20231117102025.7FC59FA3D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700216425230520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Fri Nov 17 10:20:25 UTC 2023 Modified Files: pkgsrc/mk/configure: pkg-config-override.mk Log Message: mk/configure/pkg-config-override.mk: support whitespace before Libs: Some pkg-config files have whitespace in the beginning of their statements. Such files work with pkgconf but our overrides don't work with them. So handle such cases as well. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/configure/pkg-config-override.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700216425230520 Content-Disposition: inline Content-Length: 841 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/configure/pkg-config-override.mk diff -u pkgsrc/mk/configure/pkg-config-override.mk:1.5 pkgsrc/mk/configure/pkg-config-override.mk:1.6 --- pkgsrc/mk/configure/pkg-config-override.mk:1.5 Mon May 4 18:06:56 2020 +++ pkgsrc/mk/configure/pkg-config-override.mk Fri Nov 17 10:20:25 2023 @@ -1,4 +1,4 @@ -# $NetBSD: pkg-config-override.mk,v 1.5 2020/05/04 18:06:56 rillig Exp $ +# $NetBSD: pkg-config-override.mk,v 1.6 2023/11/17 10:20:25 nros Exp $ # Package-settable variables: # @@ -27,7 +27,7 @@ pkg-config-override: pkg-config-override: subst-pkgconfig PKGCONFIG_OVERRIDE_SED= \ - '/^Libs:.*[ ]/s|-L\([ ]*[^ ]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g' + '/^[ ]*Libs:.*[ ]/s|-L\([ ]*[^ ]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g' PKGCONFIG_OVERRIDE_STAGE?= pre-configure SUBST_CLASSES+= _pkgconfig --_----------=_1700216425230520--