From fa7501ac8723648991ba05539732bbba2902f8d9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 6 May 2024 12:44:29 +0200 Subject: Switch from libpkg-config to version from libbutl --- libbuild2/cc/buildfile | 2 +- manifest | 1 - repositories.manifest | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libbuild2/cc/buildfile b/libbuild2/cc/buildfile index 7dcd811..654d0a4 100644 --- a/libbuild2/cc/buildfile +++ b/libbuild2/cc/buildfile @@ -11,7 +11,7 @@ libpkgconf = $config.build2.libpkgconf if $libpkgconf import impl_libs += libpkgconf%lib{pkgconf} else - import impl_libs += libpkg-config%lib{pkg-config} + import impl_libs += libbutl%lib{butl-pkg-config} include ../bin/ intf_libs = ../bin/lib{build2-bin} diff --git a/manifest b/manifest index 4781eef..fecd6c5 100644 --- a/manifest +++ b/manifest @@ -19,4 +19,3 @@ depends: * bpkg >= 0.16.0- # @@ DEP Should probably become conditional dependency. #requires: ? cli ; Only required if changing .cli files. depends: libbutl [0.17.0-a.0.1 0.17.0-a.1) -depends: libpkg-config ~0.1.1 diff --git a/repositories.manifest b/repositories.manifest index 81d0645..3d857bc 100644 --- a/repositories.manifest +++ b/repositories.manifest @@ -4,7 +4,3 @@ summary: build2 build system repository : role: prerequisite location: ../libbutl.git##HEAD - -: -role: prerequisite -location: https://github.com/build2/libpkg-config.git##HEAD -- cgit v1.1