tools/pkg-config: Replace with pkgconf
pkgconf is a newer, actively maintained implementation of pkg-config that supports more aspects of the pkg-config file specification and provides a library interface that applications can use to incorporate intelligent handling of pkg-config files into themselves (such as build file generators, IDEs, and compilers). Through its pkg-config compatibility interface (activated when it is run as "pkg-config"), it also can completely replace the original implementation. It is also lighterweight and does not require glib2, as pkg-config does. On other distros, pkgconf is symlinked to pkg-config. For simplicity here, it is renamed to pkg-config.real, as in the original package. Initial results have been positive. As before, pkgconf works as long as the pkg-config files point to the proper paths. Signed-off-by: Rosen Penev <rosenp@gmail.com> [backported upstream fix for Meson] Signed-off-by: Petr Štetiar <ynezz@true.cz>master
parent
af878339ae
commit
867298cf47
@ -0,0 +1,36 @@
|
||||
From 62bbd3b664d4b03011a4b382ed20353a91c30406 Mon Sep 17 00:00:00 2001
|
||||
From: Ariadne Conill <ariadne@dereferenced.org>
|
||||
Date: Tue, 21 Jan 2020 10:32:36 -0600
|
||||
Subject: [PATCH] cli: remove --version to --modversion remapping
|
||||
|
||||
This has been a source of frequent complaints, so we drop it.
|
||||
Resolves: https://todo.sr.ht/~kaniini/pkgconf/6
|
||||
---
|
||||
cli/main.c | 14 ++------------
|
||||
1 file changed, 2 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/cli/main.c b/cli/main.c
|
||||
index 563ec8f0cfcd..fc698a4f9191 100644
|
||||
--- a/cli/main.c
|
||||
+++ b/cli/main.c
|
||||
@@ -1005,18 +1005,8 @@ main(int argc, char *argv[])
|
||||
|
||||
if ((want_flags & PKG_VERSION) == PKG_VERSION)
|
||||
{
|
||||
- if (argc > 2)
|
||||
- {
|
||||
- fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]);
|
||||
-
|
||||
- want_flags &= ~PKG_VERSION;
|
||||
- want_flags |= PKG_MODVERSION;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- version();
|
||||
- return EXIT_SUCCESS;
|
||||
- }
|
||||
+ version();
|
||||
+ return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
if ((want_flags & PKG_HELP) == PKG_HELP)
|
Loading…
Reference in New Issue