CVS commit: pkgsrc/devel/abseil

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Nov 21 18:26:31 UTC 2023

Modified Files:
        pkgsrc/devel/abseil: Makefile
Removed Files:
        pkgsrc/devel/abseil: pkgconfig-overrides.mk

Log Message:
abseil: Revert last commit and use *.pc instead
As pointed out by wiz, *.pc can be used. This
makes the list useless and handling of pc files
even easier.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/abseil/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/abseil/pkgconfig-overrides.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/abseil/Makefile
diff -u pkgsrc/devel/abseil/Makefile:1.21 pkgsrc/devel/abseil/Makefile:1.22
--- pkgsrc/devel/abseil/Makefile:1.21   Tue Nov 21 17:57:18 2023
+++ pkgsrc/devel/abseil/Makefile        Tue Nov 21 18:26:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/11/21 17:57:18 nros Exp $
+# $NetBSD: Makefile,v 1.22 2023/11/21 18:26:30 nros Exp $
 
 DISTNAME=      abseil-20230802.1
 CATEGORIES=    devel
@@ -27,26 +27,8 @@ BUILDLINK_TRANSFORM+=        rm:-lexecinfo
 .  endif
 .endif
 
-ABSLPC_DIR=                    ${WRKSRC}/${CMAKE_BUILD_DIR}/lib/pkgconfig
 PKGCONFIG_OVERRIDE_STAGE=      post-build
-
-.include "pkgconfig-overrides.mk"
-
-
-# abseil installs a lot of pkg-config files so maintaining a list of
-# pkgconfig overrides whould take a lot of time. Below is a target to
-# ease this work.
-# The target can be run when updating the package to update the list of
-# pkgconfig files that need an override.
-.PHONY: update-pkgconfig-overrides
-update-pkgconfig-overrides: all
-       ${RUN} ${HEAD} -n 1 pkgconfig-overrides.mk > pkgconfig-overrides.mk.tmp
-       ${RUN} ${MV} pkgconfig-overrides.mk.tmp pkgconfig-overrides.mk
-       ${RUN} cd ${ABSLPC_DIR} && \
-               ${GREP} "\-l[   ]*absl" * | ${SED} 's/:[        ]*Libs:.*//g' | \
-               ${SED} 's,^,PKGCONFIG_OVERRIDE+=\       \$$\{ABSLPC_DIR\}/,g' \
-               >> ${.CURDIR}/pkgconfig-overrides.mk
-
+PKGCONFIG_OVERRIDE=            ${CMAKE_BUILD_DIR}/lib/pkgconfig/*.pc
 
 .include "../../devel/cmake/build.mk"
 .include "../../mk/atomic64.mk"