CVS commit: pkgsrc/mk/configure

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

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.

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