aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2022-07-05 11:13:04 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-07-05 11:13:04 +0300
commite3809006140fb4bfa3c0ef8f535ab6cd7af09095 (patch)
tree1cb3ba4466153553702e9d2b8b01da73d92edd2f
parent58688a656eaf337b941c4b5159114a51637f0f48 (diff)
Use LIBPKG_CONFIG_PKG_* flags/errorslibpkg-config
-rw-r--r--libbuild2/cc/pkgconfig-libpkg-config.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/cc/pkgconfig-libpkg-config.cxx b/libbuild2/cc/pkgconfig-libpkg-config.cxx
index 0a9165a..8cc8958 100644
--- a/libbuild2/cc/pkgconfig-libpkg-config.cxx
+++ b/libbuild2/cc/pkgconfig-libpkg-config.cxx
@@ -191,19 +191,19 @@ namespace build2
// besides the public ones while collecting the flags. Note that we do
// this for both static and shared linking.
//
- PKGCONF_PKG_PKGF_SEARCH_PRIVATE |
+ LIBPKG_CONFIG_PKG_PKGF_SEARCH_PRIVATE |
// Collect flags from Cflags.private besides those from Cflags for the
// static linking.
//
(stat
- ? PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS
+ ? LIBPKG_CONFIG_PKG_PKGF_ADD_PRIVATE_FRAGMENTS
: 0));
pkgconf_list_t f = PKGCONF_LIST_INITIALIZER; // Aggregate initialization.
int e (pkgconf_pkg_cflags (client_, pkg_, &f, max_depth));
- if (e != PKGCONF_PKG_ERRF_OK)
+ if (e != LIBPKG_CONFIG_PKG_ERRF_OK)
throw failed (); // Assume the diagnostics is issued.
unique_ptr<pkgconf_list_t, fragments_deleter> fd (&f); // Auto-deleter.
@@ -223,14 +223,14 @@ namespace build2
// (see above) and from the Libs.private value for the static linking.
//
(stat
- ? PKGCONF_PKG_PKGF_SEARCH_PRIVATE |
- PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS
+ ? LIBPKG_CONFIG_PKG_PKGF_SEARCH_PRIVATE |
+ LIBPKG_CONFIG_PKG_PKGF_ADD_PRIVATE_FRAGMENTS
: 0));
pkgconf_list_t f = PKGCONF_LIST_INITIALIZER; // Aggregate initialization.
int e (pkgconf_pkg_libs (client_, pkg_, &f, max_depth));
- if (e != PKGCONF_PKG_ERRF_OK)
+ if (e != LIBPKG_CONFIG_PKG_ERRF_OK)
throw failed (); // Assume the diagnostics is issued.
unique_ptr<pkgconf_list_t, fragments_deleter> fd (&f); // Auto-deleter.