Tue Nov 21 18:26:31 2023 UTC ()
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.


(nros)
diff -r1.21 -r1.22 pkgsrc/devel/abseil/Makefile
diff -r1.1 -r0 pkgsrc/devel/abseil/pkgconfig-overrides.mk
Wed Nov 22 03:26:31 2023
Thu Jan 1 09:00:00 1970
pkgsrc/devel/abseil/pkgconfig-overrides.mk,v
anoncvs not yet been updated
cvs diff -r1.21 -r1.22 pkgsrc/devel/abseil/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/abseil/Makefile 2023/11/21 17:57:18 1.21
+++ pkgsrc/devel/abseil/Makefile 2023/11/21 18:26:30 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2023/11/21 17:57:18 nros Exp $ 1# $NetBSD: Makefile,v 1.22 2023/11/21 18:26:30 nros Exp $
2 2
3DISTNAME= abseil-20230802.1 3DISTNAME= abseil-20230802.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=abseil/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=abseil/}
6GITHUB_PROJECT= abseil-cpp 6GITHUB_PROJECT= abseil-cpp
7GITHUB_TAG= ${PKGVERSION_NOREV} 7GITHUB_TAG= ${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/abseil/abseil-cpp 10HOMEPAGE= https://github.com/abseil/abseil-cpp
11COMMENT= C++ Common Libraries 11COMMENT= C++ Common Libraries
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14USE_CXX_FEATURES= c++14 14USE_CXX_FEATURES= c++14
@@ -17,37 +17,19 @@ CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LI @@ -17,37 +17,19 @@ CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LI
17 17
18# .buildlink/include/absl/base/policy_checks.h:57:2: error: 18# .buildlink/include/absl/base/policy_checks.h:57:2: error:
19# #error "This package requires GCC 7 or higher." 19# #error "This package requires GCC 7 or higher."
20GCC_REQD+= 7 20GCC_REQD+= 7
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24.if ${OPSYS} == "Darwin" 24.if ${OPSYS} == "Darwin"
25. if exists(${OSX_SDK_PATH}/usr/include/execinfo.h) 25. if exists(${OSX_SDK_PATH}/usr/include/execinfo.h)
26BUILDLINK_TRANSFORM+= rm:-lexecinfo 26BUILDLINK_TRANSFORM+= rm:-lexecinfo
27. endif 27. endif
28.endif 28.endif
29 29
30ABSLPC_DIR= ${WRKSRC}/${CMAKE_BUILD_DIR}/lib/pkgconfig 
31PKGCONFIG_OVERRIDE_STAGE= post-build 30PKGCONFIG_OVERRIDE_STAGE= post-build
32 31PKGCONFIG_OVERRIDE= ${CMAKE_BUILD_DIR}/lib/pkgconfig/*.pc
33.include "pkgconfig-overrides.mk" 
34 
35 
36# abseil installs a lot of pkg-config files so maintaining a list of 
37# pkgconfig overrides whould take a lot of time. Below is a target to 
38# ease this work. 
39# The target can be run when updating the package to update the list of 
40# pkgconfig files that need an override. 
41.PHONY: update-pkgconfig-overrides 
42update-pkgconfig-overrides: all 
43 ${RUN} ${HEAD} -n 1 pkgconfig-overrides.mk > pkgconfig-overrides.mk.tmp 
44 ${RUN} ${MV} pkgconfig-overrides.mk.tmp pkgconfig-overrides.mk 
45 ${RUN} cd ${ABSLPC_DIR} && \ 
46 ${GREP} "\-l[ ]*absl" * | ${SED} 's/:[ ]*Libs:.*//g' | \ 
47 ${SED} 's,^,PKGCONFIG_OVERRIDE+=\ \$$\{ABSLPC_DIR\}/,g' \ 
48 >> ${.CURDIR}/pkgconfig-overrides.mk 
49 
50 32
51.include "../../devel/cmake/build.mk" 33.include "../../devel/cmake/build.mk"
52.include "../../mk/atomic64.mk" 34.include "../../mk/atomic64.mk"
53.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/devel/abseil/pkgconfig-overrides.mk