From nobody Wed Apr 22 13:45:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g10ps5wj6z6ZZSP for ; Wed, 22 Apr 2026 13:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g10ps552Pz3Y4l for ; Wed, 22 Apr 2026 13:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776865525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooEZ8S74uLiOcDTfTre2XVkiJ96bBmgTkuk6Rms9tXQ=; b=tWVcAabFGUirLmwylTwuS3oLAVyf60i7G2fjeMXinbXGeGbK+sLxPwEnoDekFY2IATOQGz 5mPB60MBWXSBTjkAVkVU+23UxFBYsB69DEjV0yT3BeCgYIcmkCuByhbnJVIGHkSDHYZtSv YE8drmckCAtaqnQunGOa7J1yl+UGHOwu6dJeBYBhJNpqfwFR4GZB6b/f2rfKbf32aWZdob VjZGc0BW29d11JxyHPGsAjMkXN6p3CgXOgPC3vV3wVLDdYIgRYHnNZH0ZxqJP0KmqhSkux bPa41uLsC9D8Ym5o5+W3TaKFIseLE4/mSRQGbC4eFEzVehiIwwdQPcvXCDgp8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776865525; a=rsa-sha256; cv=none; b=nA5UPVtGWt8uO6mclDqb6Eqs1gK5ChSclRv88bW5laMQrxauWYMZSgFOsri5mir4pecP7B NPGT2FhvQmCssVRs3xJ4Xrle28nYFtRVpJrKjA9SPnp5JPhmPQWa5P/cT91AWnSAhBhbFh fqtQXuZv+DPX7WvAoeBmidfVeuJXcYOH2N4YViOSsM9B4SU/cGXV/jhaBTxj0P9EiaJ0jb 6ihRJa63xu2d2V7GIJKMHXKgfhSmg5usGDl1ym99qbAjbmV9jZLE++Yk7+BY0npe+g9UBV ZNz8xtG09Abp1IVSZcsrMjNAjH96QN/KZPuOgy8aq7Mb/e5VO62APvqIEmzhug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776865525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooEZ8S74uLiOcDTfTre2XVkiJ96bBmgTkuk6Rms9tXQ=; b=B2gCYQ+QeBT8SMS7gBmmDx50C38umRmUC18qnGvW8a5V4J/aaXDSPFkP26HYM3BolatFyE ShSfMKFAga5k8pdoLBNKmam4gIF7z6rVng0XVC/x7rogq6zXcDZoiAOFi9b+MRt5eARnVT BusDIkw64dTHuVI+hVxy5f6SQCqBvKzk4PQLuXYjEaUiYEhi5ClajddE1bslj4ZuQUnplw V3xTGVYzAuFwAkIHHAP3MIM9/2Dg6GPfXVc7TtVPyM48iYouYVSqZMAP79QiLDoRLQj8Ce +9I9JXNmMvKfcGLnjKtrD0NVdtBKC/CQHBizfhbujo8a+T96YqmSC2wMmDkcFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g10ps3mKmzYqn for ; Wed, 22 Apr 2026 13:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21991 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 13:45:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: a3cefe7f2b4d - main - Add 'contrib/pkgconf/' from commit '6294b6ab217a2d5f1d2bc23a64505a228294c508' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3cefe7f2b4df0f70ff92d4570ce18e517af43ec Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 13:45:25 +0000 Message-Id: <69e8d0f5.21991.2317e6c2@gitrepo.freebsd.org> The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=a3cefe7f2b4df0f70ff92d4570ce18e517af43ec commit a3cefe7f2b4df0f70ff92d4570ce18e517af43ec Merge: 45827f9ad2e3 6294b6ab217a Author: Pierre Pronchery AuthorDate: 2026-04-22 13:13:42 +0000 Commit: Pierre Pronchery CommitDate: 2026-04-22 13:13:42 +0000 Add 'contrib/pkgconf/' from commit '6294b6ab217a2d5f1d2bc23a64505a228294c508' git-subtree-dir: contrib/pkgconf git-subtree-mainline: 45827f9ad2e32ec8e4cdde62cbf722a48fb1b396 git-subtree-split: 6294b6ab217a2d5f1d2bc23a64505a228294c508 contrib/pkgconf/AUTHORS | 41 + contrib/pkgconf/CODE_OF_CONDUCT.md | 27 + contrib/pkgconf/COPYING | 10 + contrib/pkgconf/Kyuafile.in | 5 + contrib/pkgconf/Makefile.am | 217 +++ contrib/pkgconf/Makefile.lite | 77 + contrib/pkgconf/NEWS | 943 ++++++++++ contrib/pkgconf/README.md | 130 ++ contrib/pkgconf/autogen.sh | 87 + contrib/pkgconf/cli/bomtool/main.c | 368 ++++ contrib/pkgconf/cli/getopt_long.c | 643 +++++++ contrib/pkgconf/cli/getopt_long.h | 70 + contrib/pkgconf/cli/main.c | 1823 ++++++++++++++++++ contrib/pkgconf/cli/renderer-msvc.c | 172 ++ contrib/pkgconf/cli/renderer-msvc.h | 23 + contrib/pkgconf/configure.ac | 66 + contrib/pkgconf/doc/conf.py | 339 ++++ contrib/pkgconf/doc/extract.py | 149 ++ contrib/pkgconf/doc/index.rst | 14 + contrib/pkgconf/doc/libpkgconf-argvsplit.rst | 23 + contrib/pkgconf/doc/libpkgconf-audit.rst | 35 + contrib/pkgconf/doc/libpkgconf-cache.rst | 45 + contrib/pkgconf/doc/libpkgconf-client.rst | 212 +++ contrib/pkgconf/doc/libpkgconf-dependency.rst | 90 + contrib/pkgconf/doc/libpkgconf-fragment.rst | 116 ++ contrib/pkgconf/doc/libpkgconf-path.rst | 71 + contrib/pkgconf/doc/libpkgconf-personality.rst | 27 + contrib/pkgconf/doc/libpkgconf-pkg.rst | 154 ++ contrib/pkgconf/doc/libpkgconf-queue.rst | 78 + contrib/pkgconf/doc/libpkgconf-tuple.rst | 92 + contrib/pkgconf/doc/libpkgconf.rst | 17 + contrib/pkgconf/libpkgconf.pc.in | 12 + contrib/pkgconf/libpkgconf/argvsplit.c | 161 ++ contrib/pkgconf/libpkgconf/audit.c | 98 + contrib/pkgconf/libpkgconf/bsdstubs.c | 197 ++ contrib/pkgconf/libpkgconf/bsdstubs.h | 36 + contrib/pkgconf/libpkgconf/buffer.c | 87 + contrib/pkgconf/libpkgconf/cache.c | 231 +++ contrib/pkgconf/libpkgconf/client.c | 817 +++++++++ contrib/pkgconf/libpkgconf/config.h.meson | 79 + contrib/pkgconf/libpkgconf/dependency.c | 506 +++++ contrib/pkgconf/libpkgconf/fileio.c | 113 ++ contrib/pkgconf/libpkgconf/fragment.c | 803 ++++++++ contrib/pkgconf/libpkgconf/iter.h | 113 ++ contrib/pkgconf/libpkgconf/libpkgconf-api.h | 19 + contrib/pkgconf/libpkgconf/libpkgconf.h | 493 +++++ contrib/pkgconf/libpkgconf/meson.build | 12 + contrib/pkgconf/libpkgconf/parser.c | 115 ++ contrib/pkgconf/libpkgconf/path.c | 459 +++++ contrib/pkgconf/libpkgconf/personality.c | 359 ++++ contrib/pkgconf/libpkgconf/pkg.c | 1935 ++++++++++++++++++++ contrib/pkgconf/libpkgconf/queue.c | 408 +++++ contrib/pkgconf/libpkgconf/stdinc.h | 75 + contrib/pkgconf/libpkgconf/tuple.c | 476 +++++ contrib/pkgconf/libpkgconf/win-dirent.h | 1028 +++++++++++ contrib/pkgconf/m4/ax_check_compile_flag.m4 | 53 + contrib/pkgconf/man/bomtool.1 | 100 + contrib/pkgconf/man/pc.5 | 178 ++ contrib/pkgconf/man/pkg.m4.7 | 143 ++ contrib/pkgconf/man/pkgconf-personality.5 | 100 + contrib/pkgconf/man/pkgconf.1 | 758 ++++++++ contrib/pkgconf/meson.build | 199 ++ contrib/pkgconf/meson_options.txt | 19 + contrib/pkgconf/pkg.m4 | 350 ++++ contrib/pkgconf/pkgconf.wxs.in | 64 + contrib/pkgconf/tests/Kyuafile.in | 14 + contrib/pkgconf/tests/basic.sh | 391 ++++ contrib/pkgconf/tests/builtins.sh | 68 + contrib/pkgconf/tests/conflicts.sh | 23 + contrib/pkgconf/tests/framework.sh | 20 + .../tests/lib-relocatable/lib/pkgconfig/foo.pc | 11 + contrib/pkgconf/tests/lib1/argv-parse-2.pc | 10 + contrib/pkgconf/tests/lib1/argv-parse-3.pc | 11 + contrib/pkgconf/tests/lib1/argv-parse.pc | 10 + contrib/pkgconf/tests/lib1/bar.pc | 10 + contrib/pkgconf/tests/lib1/baz.pc | 11 + contrib/pkgconf/tests/lib1/billion-laughs.pc | 13 + contrib/pkgconf/tests/lib1/c-comment.pc | 17 + contrib/pkgconf/tests/lib1/case-sensitivity.pc | 7 + contrib/pkgconf/tests/lib1/cflags-internal.pc | 9 + contrib/pkgconf/tests/lib1/cflags-libs-only.pc | 10 + .../pkgconf/tests/lib1/cflags-libs-private-a.pc | 7 + .../pkgconf/tests/lib1/cflags-libs-private-b.pc | 7 + .../pkgconf/tests/lib1/cflags-libs-private-c.pc | 6 + .../tests/lib1/cflags-whitespace-trailing.pc | 4 + contrib/pkgconf/tests/lib1/cflags-whitespace.pc | 4 + .../lib1/child-prefix/pkgconfig/child-prefix-1.pc | 11 + contrib/pkgconf/tests/lib1/circular-1.pc | 11 + contrib/pkgconf/tests/lib1/circular-2.pc | 11 + contrib/pkgconf/tests/lib1/circular-3.pc | 11 + contrib/pkgconf/tests/lib1/comments-in-fields.pc | 9 + contrib/pkgconf/tests/lib1/comments.pc | 6 + contrib/pkgconf/tests/lib1/conflicts.pc | 11 + contrib/pkgconf/tests/lib1/depgraph-break.pc | 12 + contrib/pkgconf/tests/lib1/dos-lineendings.pc | 10 + contrib/pkgconf/tests/lib1/empty-tuple.pc | 6 + contrib/pkgconf/tests/lib1/escaped-backslash.pc | 4 + contrib/pkgconf/tests/lib1/explicit-sysroot.pc | 7 + contrib/pkgconf/tests/lib1/flag-order-1.pc | 10 + contrib/pkgconf/tests/lib1/flag-order-3.pc | 10 + contrib/pkgconf/tests/lib1/foo.pc | 12 + contrib/pkgconf/tests/lib1/foobar.pc | 12 + contrib/pkgconf/tests/lib1/fragment-collision-1.pc | 4 + contrib/pkgconf/tests/lib1/fragment-collision-2.pc | 4 + .../tests/lib1/fragment-collision-intermediary.pc | 5 + contrib/pkgconf/tests/lib1/fragment-collision.pc | 6 + contrib/pkgconf/tests/lib1/fragment-comment.pc | 4 + contrib/pkgconf/tests/lib1/fragment-escaping-1.pc | 5 + contrib/pkgconf/tests/lib1/fragment-escaping-2.pc | 4 + contrib/pkgconf/tests/lib1/fragment-escaping-3.pc | 4 + contrib/pkgconf/tests/lib1/fragment-group-a.pc | 4 + contrib/pkgconf/tests/lib1/fragment-group-b.pc | 4 + contrib/pkgconf/tests/lib1/fragment-group-c.pc | 4 + contrib/pkgconf/tests/lib1/fragment-groups-2.pc | 4 + contrib/pkgconf/tests/lib1/fragment-groups.pc | 4 + contrib/pkgconf/tests/lib1/fragment-quoting-2.pc | 10 + contrib/pkgconf/tests/lib1/fragment-quoting-3.pc | 10 + contrib/pkgconf/tests/lib1/fragment-quoting-5.pc | 10 + contrib/pkgconf/tests/lib1/fragment-quoting-7.pc | 4 + contrib/pkgconf/tests/lib1/fragment-quoting.pc | 10 + contrib/pkgconf/tests/lib1/framework-1.pc | 9 + contrib/pkgconf/tests/lib1/framework-2.pc | 10 + contrib/pkgconf/tests/lib1/idirafter-ordering.pc | 4 + contrib/pkgconf/tests/lib1/idirafter.pc | 4 + contrib/pkgconf/tests/lib1/incomplete.pc | 4 + contrib/pkgconf/tests/lib1/intermediary-1.pc | 10 + contrib/pkgconf/tests/lib1/intermediary-2.pc | 10 + contrib/pkgconf/tests/lib1/isystem.pc | 4 + contrib/pkgconf/tests/lib1/malformed-1.pc | 2 + contrib/pkgconf/tests/lib1/malformed-quoting.pc | 4 + contrib/pkgconf/tests/lib1/malformed-version.pc | 5 + contrib/pkgconf/tests/lib1/metapackage-1.pc | 6 + contrib/pkgconf/tests/lib1/metapackage-2.pc | 5 + contrib/pkgconf/tests/lib1/metapackage-3.pc | 4 + contrib/pkgconf/tests/lib1/metapackage.pc | 4 + contrib/pkgconf/tests/lib1/missing-require.pc | 11 + contrib/pkgconf/tests/lib1/multiline-bogus.pc | 9 + contrib/pkgconf/tests/lib1/multiline.pc | 9 + contrib/pkgconf/tests/lib1/no-trailing-newline.pc | 10 + contrib/pkgconf/tests/lib1/nocflag.pc | 9 + contrib/pkgconf/tests/lib1/nolib.pc | 9 + .../pkgconf/tests/lib1/omg-sysroot-uninstalled.pc | 10 + contrib/pkgconf/tests/lib1/omg-uninstalled.pc | 10 + .../tests/lib1/orphaned-requires-private.pc | 8 + contrib/pkgconf/tests/lib1/paren-quoting.pc | 5 + contrib/pkgconf/tests/lib1/pcfiledir.pc | 8 + contrib/pkgconf/tests/lib1/prefix-foo1.pc | 12 + contrib/pkgconf/tests/lib1/prefix-foo2.pc | 12 + .../pkgconf/tests/lib1/private-libs-duplication.pc | 7 + .../pkgconf/tests/lib1/provides-request-simple.pc | 6 + contrib/pkgconf/tests/lib1/provides.pc | 6 + contrib/pkgconf/tests/lib1/quotes.pc | 10 + contrib/pkgconf/tests/lib1/requires-internal-2.pc | 9 + .../tests/lib1/requires-internal-collision.pc | 10 + .../tests/lib1/requires-internal-missing.pc | 10 + contrib/pkgconf/tests/lib1/requires-internal.pc | 10 + contrib/pkgconf/tests/lib1/spaces-in-paths.pc | 7 + contrib/pkgconf/tests/lib1/static-archive-libs.pc | 10 + contrib/pkgconf/tests/lib1/static-libs.pc | 12 + contrib/pkgconf/tests/lib1/sysroot-dir-2.pc | 7 + contrib/pkgconf/tests/lib1/sysroot-dir-3.pc | 9 + contrib/pkgconf/tests/lib1/sysroot-dir-4.pc | 9 + contrib/pkgconf/tests/lib1/sysroot-dir-5.pc | 9 + contrib/pkgconf/tests/lib1/sysroot-dir.pc | 5 + contrib/pkgconf/tests/lib1/tilde-quoting.pc | 5 + contrib/pkgconf/tests/lib1/tilde.pc | 11 + contrib/pkgconf/tests/lib1/truncated.pc | 1 + contrib/pkgconf/tests/lib1/tuple-quoting.pc | 7 + contrib/pkgconf/tests/lib1/typelibdir.pc | 11 + contrib/pkgconf/tests/lib1/unavailable-provider.pc | 11 + contrib/pkgconf/tests/lib1/utf8.pc | 10 + contrib/pkgconf/tests/lib1/variable-whitespace.pc | 11 + contrib/pkgconf/tests/lib2/foo.pc | 10 + contrib/pkgconf/tests/lib3/bar.pc | 10 + contrib/pkgconf/tests/meson.build | 23 + contrib/pkgconf/tests/parser.sh | 372 ++++ contrib/pkgconf/tests/provides.sh | 310 ++++ contrib/pkgconf/tests/regress.sh | 354 ++++ contrib/pkgconf/tests/requires.sh | 176 ++ contrib/pkgconf/tests/symlink.sh | 122 ++ contrib/pkgconf/tests/sysroot.sh | 110 ++ contrib/pkgconf/tests/test_env.sh.in | 50 + contrib/pkgconf/tests/version.sh | 38 + contrib/pkgconf/txt2rtf.py | 35 + 184 files changed, 19696 insertions(+) diff --cc contrib/pkgconf/AUTHORS index 000000000000,9ba1de45cb0b..9ba1de45cb0b mode 000000,100644..100644 --- a/contrib/pkgconf/AUTHORS +++ b/contrib/pkgconf/AUTHORS diff --cc contrib/pkgconf/CODE_OF_CONDUCT.md index 000000000000,1dc77b3ef9af..1dc77b3ef9af mode 000000,100644..100644 --- a/contrib/pkgconf/CODE_OF_CONDUCT.md +++ b/contrib/pkgconf/CODE_OF_CONDUCT.md diff --cc contrib/pkgconf/COPYING index 000000000000,35c7c16aa7e3..35c7c16aa7e3 mode 000000,100644..100644 --- a/contrib/pkgconf/COPYING +++ b/contrib/pkgconf/COPYING diff --cc contrib/pkgconf/Kyuafile.in index 000000000000,1490fef49c80..1490fef49c80 mode 000000,100644..100644 --- a/contrib/pkgconf/Kyuafile.in +++ b/contrib/pkgconf/Kyuafile.in diff --cc contrib/pkgconf/Makefile.am index 000000000000,93486a17a0b7..93486a17a0b7 mode 000000,100644..100644 --- a/contrib/pkgconf/Makefile.am +++ b/contrib/pkgconf/Makefile.am diff --cc contrib/pkgconf/Makefile.lite index 000000000000,6d1234331199..6d1234331199 mode 000000,100644..100644 --- a/contrib/pkgconf/Makefile.lite +++ b/contrib/pkgconf/Makefile.lite diff --cc contrib/pkgconf/NEWS index 000000000000,8b2947649e15..8b2947649e15 mode 000000,100644..100644 --- a/contrib/pkgconf/NEWS +++ b/contrib/pkgconf/NEWS diff --cc contrib/pkgconf/README.md index 000000000000,000000000000..257d686a62b6 new file mode 100644 --- /dev/null +++ b/contrib/pkgconf/README.md @@@ -1,0 -1,0 +1,130 @@@ ++# pkgconf [![test](https://github.com/pkgconf/pkgconf/actions/workflows/test.yml/badge.svg)](https://github.com/pkgconf/pkgconf/actions/workflows/test.yml) ++ ++`pkgconf` is a program which helps to configure compiler and linker flags for ++development libraries. It is a superset of the functionality provided by ++pkg-config from freedesktop.org, but does not provide bug-compatibility with ++the original pkg-config. ++ ++`libpkgconf` is a library which provides access to most of `pkgconf`'s functionality, ++to allow other tooling such as compilers and IDEs to discover and use libraries ++configured by pkgconf. ++ ++## release tarballs ++ ++Release tarballs are available on [distfiles.ariadne.space][distfiles]. ++ ++ [distfiles]: https://distfiles.ariadne.space/pkgconf/ ++ ++## build system setup ++ ++If you would like to use the git sources directly, or a snapshot of the ++sources from GitHub, you will need to regenerate the autotools build ++system artifacts yourself, or use Meson instead. For example, on Alpine: ++ ++ $ apk add autoconf automake libtool build-base ++ $ sh ./autogen.sh ++ ++## pkgconf-lite ++ ++If you only need the original pkg-config functionality, there is also pkgconf-lite, ++which builds the `pkgconf` frontend and relevant portions of `libpkgconf` functionality ++into a single binary: ++ ++ $ make -f Makefile.lite ++ ++## why `pkgconf` over original `pkg-config`? ++ ++pkgconf builds a flattened directed dependency graph, which allows for more insight ++into relationships between dependencies, allowing for some link-time dependency ++optimization, which allows for the user to more conservatively link their binaries, ++which may be helpful in some environments, such as when prelink(1) is being used. ++ ++The solver is also optimized to handle large dependency graphs with hundreds of ++thousands of edges, which can be seen in any project using the Abseil frameworks ++for example. ++ ++In addition, pkgconf has full support for virtual packages, while the original ++pkg-config does not, as well as fully supporting `Conflicts` at dependency ++resolution time, which is more efficient than checking for `Conflicts` while ++walking the dependency graph. ++ ++## linker flags optimization ++ ++pkgconf, when used effectively, can make optimizations to avoid overlinking binaries. ++ ++This functionality depends on the pkg-config module properly declaring its dependency ++tree instead of using `Libs` and `Cflags` fields to directly link against other modules ++which have pkg-config metadata files installed. ++ ++The practice of using `Libs` and `Cflags` to describe unrelated dependencies is ++not recommended in [Dan Nicholson's pkg-config tutorial][fd-tut] for this reason. ++ ++ [fd-tut]: http://people.freedesktop.org/~dbn/pkg-config-guide.html ++ ++## bug compatibility with original pkg-config ++ ++In general, we do not provide bug-level compatibility with pkg-config. ++ ++What that means is, if you feel that there is a legitimate regression versus pkg-config, ++do let us know, but also make sure that the .pc files are valid and follow the rules of ++the [pkg-config tutorial][fd-tut], as most likely fixing them to follow the specified ++rules will solve the problem. ++ ++## debug output ++ ++Please use only the stable interfaces to query pkg-config. Do not screen-scrape the ++output from `--debug`: this is sent to `stderr` for a reason, it is not intended to be ++scraped. The `--debug` output is **not** a stable interface, and should **never** be ++depended on as a source of information. If you need a stable interface to query pkg-config ++which is not covered, please get in touch. ++ ++## compiling `pkgconf` and `libpkgconf` on UNIX ++ ++pkgconf is basically compiled the same way any other autotools-based project is ++compiled: ++ ++ $ ./configure ++ $ make ++ $ sudo make install ++ ++If you are installing pkgconf into a custom prefix, such as `/opt/pkgconf`, you will ++likely want to define the default system includedir and libdir for your toolchain. ++To do this, use the `--with-system-includedir` and `--with-system-libdir` configure ++flags like so: ++ ++ $ ./configure \ ++ --prefix=/opt/pkgconf \ ++ --with-system-libdir=/lib:/usr/lib \ ++ --with-system-includedir=/usr/include ++ $ make ++ $ sudo make install ++ ++## compiling `pkgconf` and `libpkgconf` with Meson (usually for Windows) ++ ++pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use ++Meson to build on UNIX, but this is not recommended at this time as pkgconf is typically built ++much earlier than Meson. ++ ++ $ meson setup build -Dtests=disabled ++ $ meson compile -C build ++ $ meson install -C build ++ ++There are a few defines such as `SYSTEM_LIBDIR`, `PKGCONFIGDIR` and `SYSTEM_INCLUDEDIR`. ++However, on Windows, the default `PKGCONFIGDIR` value is usually overridden at runtime based ++on path relocation. ++ ++## pkg-config symlink ++ ++If you want pkgconf to be used when you invoke `pkg-config`, you should install a ++symlink for this. We do not do this for you, as we believe it is better for vendors ++to make this determination themselves. ++ ++ $ ln -sf pkgconf /usr/bin/pkg-config ++ ++## contacts ++ ++You can report bugs at . ++ ++There is a mailing list at . ++ ++You can contact us via IRC at `#pkgconf` at `irc.oftc.net`. diff --cc contrib/pkgconf/autogen.sh index 000000000000,92bd5b678973..92bd5b678973 mode 000000,100755..100755 --- a/contrib/pkgconf/autogen.sh +++ b/contrib/pkgconf/autogen.sh diff --cc contrib/pkgconf/cli/bomtool/main.c index 000000000000,1e8391aa5ae9..1e8391aa5ae9 mode 000000,100644..100644 --- a/contrib/pkgconf/cli/bomtool/main.c +++ b/contrib/pkgconf/cli/bomtool/main.c diff --cc contrib/pkgconf/cli/getopt_long.c index 000000000000,c47215fae4cf..c47215fae4cf mode 000000,100644..100644 --- a/contrib/pkgconf/cli/getopt_long.c +++ b/contrib/pkgconf/cli/getopt_long.c diff --cc contrib/pkgconf/cli/getopt_long.h index 000000000000,b1242915ab5b..b1242915ab5b mode 000000,100644..100644 --- a/contrib/pkgconf/cli/getopt_long.h +++ b/contrib/pkgconf/cli/getopt_long.h diff --cc contrib/pkgconf/cli/main.c index 000000000000,53eee4c87443..53eee4c87443 mode 000000,100644..100644 --- a/contrib/pkgconf/cli/main.c +++ b/contrib/pkgconf/cli/main.c diff --cc contrib/pkgconf/cli/renderer-msvc.c index 000000000000,8e31699bbca4..8e31699bbca4 mode 000000,100644..100644 --- a/contrib/pkgconf/cli/renderer-msvc.c +++ b/contrib/pkgconf/cli/renderer-msvc.c diff --cc contrib/pkgconf/cli/renderer-msvc.h index 000000000000,2a095fdc36b4..2a095fdc36b4 mode 000000,100644..100644 --- a/contrib/pkgconf/cli/renderer-msvc.h +++ b/contrib/pkgconf/cli/renderer-msvc.h diff --cc contrib/pkgconf/configure.ac index 000000000000,3fee9bd444e0..3fee9bd444e0 mode 000000,100644..100644 --- a/contrib/pkgconf/configure.ac +++ b/contrib/pkgconf/configure.ac diff --cc contrib/pkgconf/doc/conf.py index 000000000000,ca608c7f1065..ca608c7f1065 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/conf.py +++ b/contrib/pkgconf/doc/conf.py diff --cc contrib/pkgconf/doc/extract.py index 000000000000,10ea62037869..10ea62037869 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/extract.py +++ b/contrib/pkgconf/doc/extract.py diff --cc contrib/pkgconf/doc/index.rst index 000000000000,b0c7c4bd24b9..b0c7c4bd24b9 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/index.rst +++ b/contrib/pkgconf/doc/index.rst diff --cc contrib/pkgconf/doc/libpkgconf-argvsplit.rst index 000000000000,94ec6d93f852..94ec6d93f852 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-argvsplit.rst +++ b/contrib/pkgconf/doc/libpkgconf-argvsplit.rst diff --cc contrib/pkgconf/doc/libpkgconf-audit.rst index 000000000000,0baaba308186..0baaba308186 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-audit.rst +++ b/contrib/pkgconf/doc/libpkgconf-audit.rst diff --cc contrib/pkgconf/doc/libpkgconf-cache.rst index 000000000000,adfa79d79587..adfa79d79587 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-cache.rst +++ b/contrib/pkgconf/doc/libpkgconf-cache.rst diff --cc contrib/pkgconf/doc/libpkgconf-client.rst index 000000000000,6816fdf4b341..6816fdf4b341 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-client.rst +++ b/contrib/pkgconf/doc/libpkgconf-client.rst diff --cc contrib/pkgconf/doc/libpkgconf-dependency.rst index 000000000000,ce70d6c11c35..ce70d6c11c35 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-dependency.rst +++ b/contrib/pkgconf/doc/libpkgconf-dependency.rst diff --cc contrib/pkgconf/doc/libpkgconf-fragment.rst index 000000000000,00759b7de968..00759b7de968 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-fragment.rst +++ b/contrib/pkgconf/doc/libpkgconf-fragment.rst diff --cc contrib/pkgconf/doc/libpkgconf-path.rst index 000000000000,04789440a2d3..04789440a2d3 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-path.rst +++ b/contrib/pkgconf/doc/libpkgconf-path.rst diff --cc contrib/pkgconf/doc/libpkgconf-personality.rst index 000000000000,134671ad1211..134671ad1211 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-personality.rst +++ b/contrib/pkgconf/doc/libpkgconf-personality.rst diff --cc contrib/pkgconf/doc/libpkgconf-pkg.rst index 000000000000,044bd1f2f011..044bd1f2f011 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-pkg.rst +++ b/contrib/pkgconf/doc/libpkgconf-pkg.rst diff --cc contrib/pkgconf/doc/libpkgconf-queue.rst index 000000000000,43fca6960d25..43fca6960d25 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-queue.rst +++ b/contrib/pkgconf/doc/libpkgconf-queue.rst diff --cc contrib/pkgconf/doc/libpkgconf-tuple.rst index 000000000000,419168b0e466..419168b0e466 mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf-tuple.rst +++ b/contrib/pkgconf/doc/libpkgconf-tuple.rst diff --cc contrib/pkgconf/doc/libpkgconf.rst index 000000000000,37167f0f25fe..37167f0f25fe mode 000000,100644..100644 --- a/contrib/pkgconf/doc/libpkgconf.rst +++ b/contrib/pkgconf/doc/libpkgconf.rst diff --cc contrib/pkgconf/libpkgconf.pc.in index 000000000000,119fe57f827d..119fe57f827d mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf.pc.in +++ b/contrib/pkgconf/libpkgconf.pc.in diff --cc contrib/pkgconf/libpkgconf/argvsplit.c index 000000000000,1ff221ac63f8..1ff221ac63f8 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/argvsplit.c +++ b/contrib/pkgconf/libpkgconf/argvsplit.c diff --cc contrib/pkgconf/libpkgconf/audit.c index 000000000000,a06eb24fc728..a06eb24fc728 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/audit.c +++ b/contrib/pkgconf/libpkgconf/audit.c diff --cc contrib/pkgconf/libpkgconf/bsdstubs.c index 000000000000,a5291f7a5a93..a5291f7a5a93 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/bsdstubs.c +++ b/contrib/pkgconf/libpkgconf/bsdstubs.c diff --cc contrib/pkgconf/libpkgconf/bsdstubs.h index 000000000000,21b9432a4a55..21b9432a4a55 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/bsdstubs.h +++ b/contrib/pkgconf/libpkgconf/bsdstubs.h diff --cc contrib/pkgconf/libpkgconf/buffer.c index 000000000000,6857022db414..6857022db414 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/buffer.c +++ b/contrib/pkgconf/libpkgconf/buffer.c diff --cc contrib/pkgconf/libpkgconf/cache.c index 000000000000,883c8df7127e..883c8df7127e mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/cache.c +++ b/contrib/pkgconf/libpkgconf/cache.c diff --cc contrib/pkgconf/libpkgconf/client.c index 000000000000,4fe36ecd9af9..4fe36ecd9af9 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/client.c +++ b/contrib/pkgconf/libpkgconf/client.c diff --cc contrib/pkgconf/libpkgconf/config.h.meson index 000000000000,2ea7db2e20de..2ea7db2e20de mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/config.h.meson +++ b/contrib/pkgconf/libpkgconf/config.h.meson diff --cc contrib/pkgconf/libpkgconf/dependency.c index 000000000000,9b64809a4114..9b64809a4114 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/dependency.c +++ b/contrib/pkgconf/libpkgconf/dependency.c diff --cc contrib/pkgconf/libpkgconf/fileio.c index 000000000000,d4f001b9c3e3..d4f001b9c3e3 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/fileio.c +++ b/contrib/pkgconf/libpkgconf/fileio.c diff --cc contrib/pkgconf/libpkgconf/fragment.c index 000000000000,2b6109039b47..2b6109039b47 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/fragment.c +++ b/contrib/pkgconf/libpkgconf/fragment.c diff --cc contrib/pkgconf/libpkgconf/iter.h index 000000000000,199d299f6bed..199d299f6bed mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/iter.h +++ b/contrib/pkgconf/libpkgconf/iter.h diff --cc contrib/pkgconf/libpkgconf/libpkgconf-api.h index 000000000000,a924c80ce833..a924c80ce833 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/libpkgconf-api.h +++ b/contrib/pkgconf/libpkgconf/libpkgconf-api.h diff --cc contrib/pkgconf/libpkgconf/libpkgconf.h index 000000000000,ed0f1f996ce4..ed0f1f996ce4 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/libpkgconf.h +++ b/contrib/pkgconf/libpkgconf/libpkgconf.h diff --cc contrib/pkgconf/libpkgconf/meson.build index 000000000000,5c393b0ef73c..5c393b0ef73c mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/meson.build +++ b/contrib/pkgconf/libpkgconf/meson.build diff --cc contrib/pkgconf/libpkgconf/parser.c index 000000000000,3a66b8af2a8d..3a66b8af2a8d mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/parser.c +++ b/contrib/pkgconf/libpkgconf/parser.c diff --cc contrib/pkgconf/libpkgconf/path.c index 000000000000,dda77f5664ab..dda77f5664ab mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/path.c +++ b/contrib/pkgconf/libpkgconf/path.c diff --cc contrib/pkgconf/libpkgconf/personality.c index 000000000000,6c017e912776..6c017e912776 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/personality.c +++ b/contrib/pkgconf/libpkgconf/personality.c diff --cc contrib/pkgconf/libpkgconf/pkg.c index 000000000000,491c0defcd65..491c0defcd65 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/pkg.c +++ b/contrib/pkgconf/libpkgconf/pkg.c diff --cc contrib/pkgconf/libpkgconf/queue.c index 000000000000,09c02e368f85..09c02e368f85 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/queue.c +++ b/contrib/pkgconf/libpkgconf/queue.c diff --cc contrib/pkgconf/libpkgconf/stdinc.h index 000000000000,31284ed88261..31284ed88261 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/stdinc.h +++ b/contrib/pkgconf/libpkgconf/stdinc.h diff --cc contrib/pkgconf/libpkgconf/tuple.c index 000000000000,83f6a479e772..83f6a479e772 mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/tuple.c +++ b/contrib/pkgconf/libpkgconf/tuple.c diff --cc contrib/pkgconf/libpkgconf/win-dirent.h index 000000000000,0734d6dc470f..0734d6dc470f mode 000000,100644..100644 --- a/contrib/pkgconf/libpkgconf/win-dirent.h +++ b/contrib/pkgconf/libpkgconf/win-dirent.h diff --cc contrib/pkgconf/m4/ax_check_compile_flag.m4 index 000000000000,bd753b34d7dc..bd753b34d7dc mode 000000,100644..100644 --- a/contrib/pkgconf/m4/ax_check_compile_flag.m4 +++ b/contrib/pkgconf/m4/ax_check_compile_flag.m4 diff --cc contrib/pkgconf/man/bomtool.1 index 000000000000,aac6c8014ea7..aac6c8014ea7 mode 000000,100644..100644 --- a/contrib/pkgconf/man/bomtool.1 +++ b/contrib/pkgconf/man/bomtool.1 diff --cc contrib/pkgconf/man/pc.5 index 000000000000,2aee7462b073..2aee7462b073 mode 000000,100644..100644 --- a/contrib/pkgconf/man/pc.5 +++ b/contrib/pkgconf/man/pc.5 diff --cc contrib/pkgconf/man/pkg.m4.7 index 000000000000,f9210700f8f3..f9210700f8f3 mode 000000,100644..100644 --- a/contrib/pkgconf/man/pkg.m4.7 +++ b/contrib/pkgconf/man/pkg.m4.7 diff --cc contrib/pkgconf/man/pkgconf-personality.5 index 000000000000,eee70b41cf0f..eee70b41cf0f mode 000000,100644..100644 --- a/contrib/pkgconf/man/pkgconf-personality.5 +++ b/contrib/pkgconf/man/pkgconf-personality.5 diff --cc contrib/pkgconf/man/pkgconf.1 index 000000000000,df286a60593a..df286a60593a mode 000000,100644..100644 --- a/contrib/pkgconf/man/pkgconf.1 +++ b/contrib/pkgconf/man/pkgconf.1 diff --cc contrib/pkgconf/meson.build index 000000000000,30928a04c510..30928a04c510 mode 000000,100644..100644 --- a/contrib/pkgconf/meson.build +++ b/contrib/pkgconf/meson.build diff --cc contrib/pkgconf/meson_options.txt index 000000000000,e1360520bee6..e1360520bee6 mode 000000,100644..100644 --- a/contrib/pkgconf/meson_options.txt +++ b/contrib/pkgconf/meson_options.txt diff --cc contrib/pkgconf/pkg.m4 index 000000000000,ec5a70da38f5..ec5a70da38f5 mode 000000,100644..100644 --- a/contrib/pkgconf/pkg.m4 +++ b/contrib/pkgconf/pkg.m4 diff --cc contrib/pkgconf/pkgconf.wxs.in index 000000000000,13ebb069a50b..13ebb069a50b mode 000000,100644..100644 --- a/contrib/pkgconf/pkgconf.wxs.in +++ b/contrib/pkgconf/pkgconf.wxs.in diff --cc contrib/pkgconf/tests/Kyuafile.in index 000000000000,f50b749fd717..f50b749fd717 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/Kyuafile.in +++ b/contrib/pkgconf/tests/Kyuafile.in diff --cc contrib/pkgconf/tests/basic.sh index 000000000000,8debb32f2b38..8debb32f2b38 mode 000000,100755..100755 --- a/contrib/pkgconf/tests/basic.sh +++ b/contrib/pkgconf/tests/basic.sh diff --cc contrib/pkgconf/tests/builtins.sh index 000000000000,cbdea37e0c5f..cbdea37e0c5f mode 000000,100755..100755 --- a/contrib/pkgconf/tests/builtins.sh +++ b/contrib/pkgconf/tests/builtins.sh diff --cc contrib/pkgconf/tests/conflicts.sh index 000000000000,da6396f6b42c..da6396f6b42c mode 000000,100755..100755 --- a/contrib/pkgconf/tests/conflicts.sh +++ b/contrib/pkgconf/tests/conflicts.sh diff --cc contrib/pkgconf/tests/framework.sh index 000000000000,367692335746..367692335746 mode 000000,100755..100755 --- a/contrib/pkgconf/tests/framework.sh +++ b/contrib/pkgconf/tests/framework.sh diff --cc contrib/pkgconf/tests/lib-relocatable/lib/pkgconfig/foo.pc index 000000000000,f154eb76ccf1..f154eb76ccf1 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib-relocatable/lib/pkgconfig/foo.pc +++ b/contrib/pkgconf/tests/lib-relocatable/lib/pkgconfig/foo.pc diff --cc contrib/pkgconf/tests/lib1/argv-parse-2.pc index 000000000000,cfc0fcf904b2..cfc0fcf904b2 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/argv-parse-2.pc +++ b/contrib/pkgconf/tests/lib1/argv-parse-2.pc diff --cc contrib/pkgconf/tests/lib1/argv-parse-3.pc index 000000000000,b115b3001205..b115b3001205 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/argv-parse-3.pc +++ b/contrib/pkgconf/tests/lib1/argv-parse-3.pc diff --cc contrib/pkgconf/tests/lib1/argv-parse.pc index 000000000000,d445ae78e7f8..d445ae78e7f8 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/argv-parse.pc +++ b/contrib/pkgconf/tests/lib1/argv-parse.pc diff --cc contrib/pkgconf/tests/lib1/bar.pc index 000000000000,9157d06b5fd6..9157d06b5fd6 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/bar.pc +++ b/contrib/pkgconf/tests/lib1/bar.pc diff --cc contrib/pkgconf/tests/lib1/baz.pc index 000000000000,d9cb258020bc..d9cb258020bc mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/baz.pc +++ b/contrib/pkgconf/tests/lib1/baz.pc diff --cc contrib/pkgconf/tests/lib1/billion-laughs.pc index 000000000000,ad1ee7948b47..ad1ee7948b47 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/billion-laughs.pc +++ b/contrib/pkgconf/tests/lib1/billion-laughs.pc diff --cc contrib/pkgconf/tests/lib1/c-comment.pc index 000000000000,ed776a1f33e4..ed776a1f33e4 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/c-comment.pc +++ b/contrib/pkgconf/tests/lib1/c-comment.pc diff --cc contrib/pkgconf/tests/lib1/case-sensitivity.pc index 000000000000,9618061c485c..9618061c485c mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/case-sensitivity.pc +++ b/contrib/pkgconf/tests/lib1/case-sensitivity.pc diff --cc contrib/pkgconf/tests/lib1/cflags-internal.pc index 000000000000,500e566df716..500e566df716 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-internal.pc +++ b/contrib/pkgconf/tests/lib1/cflags-internal.pc diff --cc contrib/pkgconf/tests/lib1/cflags-libs-only.pc index 000000000000,718e7cd95010..718e7cd95010 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-libs-only.pc +++ b/contrib/pkgconf/tests/lib1/cflags-libs-only.pc diff --cc contrib/pkgconf/tests/lib1/cflags-libs-private-a.pc index 000000000000,fbb7742ba2e8..fbb7742ba2e8 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-libs-private-a.pc +++ b/contrib/pkgconf/tests/lib1/cflags-libs-private-a.pc diff --cc contrib/pkgconf/tests/lib1/cflags-libs-private-b.pc index 000000000000,0d5e5a45bfaa..0d5e5a45bfaa mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-libs-private-b.pc +++ b/contrib/pkgconf/tests/lib1/cflags-libs-private-b.pc diff --cc contrib/pkgconf/tests/lib1/cflags-libs-private-c.pc index 000000000000,7efc38e4bb95..7efc38e4bb95 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-libs-private-c.pc +++ b/contrib/pkgconf/tests/lib1/cflags-libs-private-c.pc diff --cc contrib/pkgconf/tests/lib1/cflags-whitespace-trailing.pc index 000000000000,2e660353b00d..2e660353b00d mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-whitespace-trailing.pc +++ b/contrib/pkgconf/tests/lib1/cflags-whitespace-trailing.pc diff --cc contrib/pkgconf/tests/lib1/cflags-whitespace.pc index 000000000000,4cd1cd164aa6..4cd1cd164aa6 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/cflags-whitespace.pc +++ b/contrib/pkgconf/tests/lib1/cflags-whitespace.pc diff --cc contrib/pkgconf/tests/lib1/child-prefix/pkgconfig/child-prefix-1.pc index 000000000000,0d32d89d9259..0d32d89d9259 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/child-prefix/pkgconfig/child-prefix-1.pc +++ b/contrib/pkgconf/tests/lib1/child-prefix/pkgconfig/child-prefix-1.pc diff --cc contrib/pkgconf/tests/lib1/circular-1.pc index 000000000000,bbdb9f79cc86..bbdb9f79cc86 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/circular-1.pc +++ b/contrib/pkgconf/tests/lib1/circular-1.pc diff --cc contrib/pkgconf/tests/lib1/circular-2.pc index 000000000000,2086834a6b85..2086834a6b85 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/circular-2.pc +++ b/contrib/pkgconf/tests/lib1/circular-2.pc diff --cc contrib/pkgconf/tests/lib1/circular-3.pc index 000000000000,e8b8e77a6c54..e8b8e77a6c54 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/circular-3.pc +++ b/contrib/pkgconf/tests/lib1/circular-3.pc diff --cc contrib/pkgconf/tests/lib1/comments-in-fields.pc index 000000000000,8e65a6557f4f..8e65a6557f4f mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/comments-in-fields.pc +++ b/contrib/pkgconf/tests/lib1/comments-in-fields.pc diff --cc contrib/pkgconf/tests/lib1/comments.pc index 000000000000,be83b3e63b40..be83b3e63b40 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/comments.pc +++ b/contrib/pkgconf/tests/lib1/comments.pc diff --cc contrib/pkgconf/tests/lib1/conflicts.pc index 000000000000,bec486982d69..bec486982d69 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/conflicts.pc +++ b/contrib/pkgconf/tests/lib1/conflicts.pc diff --cc contrib/pkgconf/tests/lib1/depgraph-break.pc index 000000000000,61e00cc62bc1..61e00cc62bc1 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/depgraph-break.pc +++ b/contrib/pkgconf/tests/lib1/depgraph-break.pc diff --cc contrib/pkgconf/tests/lib1/dos-lineendings.pc index 000000000000,cf169f159c7d..cf169f159c7d mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/dos-lineendings.pc +++ b/contrib/pkgconf/tests/lib1/dos-lineendings.pc diff --cc contrib/pkgconf/tests/lib1/empty-tuple.pc index 000000000000,a1794954a4f1..a1794954a4f1 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/empty-tuple.pc +++ b/contrib/pkgconf/tests/lib1/empty-tuple.pc diff --cc contrib/pkgconf/tests/lib1/escaped-backslash.pc index 000000000000,6abcbb064597..6abcbb064597 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/escaped-backslash.pc +++ b/contrib/pkgconf/tests/lib1/escaped-backslash.pc diff --cc contrib/pkgconf/tests/lib1/explicit-sysroot.pc index 000000000000,63c7ca042bd8..63c7ca042bd8 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/explicit-sysroot.pc +++ b/contrib/pkgconf/tests/lib1/explicit-sysroot.pc diff --cc contrib/pkgconf/tests/lib1/flag-order-1.pc index 000000000000,d84175197b19..d84175197b19 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/flag-order-1.pc +++ b/contrib/pkgconf/tests/lib1/flag-order-1.pc diff --cc contrib/pkgconf/tests/lib1/flag-order-3.pc index 000000000000,d813f50dbf4f..d813f50dbf4f mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/flag-order-3.pc +++ b/contrib/pkgconf/tests/lib1/flag-order-3.pc diff --cc contrib/pkgconf/tests/lib1/foo.pc index 000000000000,daef9f9fa956..daef9f9fa956 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/foo.pc +++ b/contrib/pkgconf/tests/lib1/foo.pc diff --cc contrib/pkgconf/tests/lib1/foobar.pc index 000000000000,e9aa84337600..e9aa84337600 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/foobar.pc +++ b/contrib/pkgconf/tests/lib1/foobar.pc diff --cc contrib/pkgconf/tests/lib1/fragment-collision-1.pc index 000000000000,201bcb0a5f97..201bcb0a5f97 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-collision-1.pc +++ b/contrib/pkgconf/tests/lib1/fragment-collision-1.pc diff --cc contrib/pkgconf/tests/lib1/fragment-collision-2.pc index 000000000000,2e6feb4a61c2..2e6feb4a61c2 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-collision-2.pc +++ b/contrib/pkgconf/tests/lib1/fragment-collision-2.pc diff --cc contrib/pkgconf/tests/lib1/fragment-collision-intermediary.pc index 000000000000,1ddb6f502cf7..1ddb6f502cf7 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-collision-intermediary.pc +++ b/contrib/pkgconf/tests/lib1/fragment-collision-intermediary.pc diff --cc contrib/pkgconf/tests/lib1/fragment-collision.pc index 000000000000,c58267513da2..c58267513da2 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-collision.pc +++ b/contrib/pkgconf/tests/lib1/fragment-collision.pc diff --cc contrib/pkgconf/tests/lib1/fragment-comment.pc index 000000000000,dfdd4f3b1dc8..dfdd4f3b1dc8 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-comment.pc +++ b/contrib/pkgconf/tests/lib1/fragment-comment.pc diff --cc contrib/pkgconf/tests/lib1/fragment-escaping-1.pc index 000000000000,b147951e5024..b147951e5024 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-escaping-1.pc +++ b/contrib/pkgconf/tests/lib1/fragment-escaping-1.pc diff --cc contrib/pkgconf/tests/lib1/fragment-escaping-2.pc index 000000000000,12e03b3482f5..12e03b3482f5 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-escaping-2.pc +++ b/contrib/pkgconf/tests/lib1/fragment-escaping-2.pc diff --cc contrib/pkgconf/tests/lib1/fragment-escaping-3.pc index 000000000000,0f002ddb084c..0f002ddb084c mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-escaping-3.pc +++ b/contrib/pkgconf/tests/lib1/fragment-escaping-3.pc diff --cc contrib/pkgconf/tests/lib1/fragment-group-a.pc index 000000000000,0e3966eab765..0e3966eab765 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-group-a.pc +++ b/contrib/pkgconf/tests/lib1/fragment-group-a.pc diff --cc contrib/pkgconf/tests/lib1/fragment-group-b.pc index 000000000000,ac7dda7223ac..ac7dda7223ac mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-group-b.pc +++ b/contrib/pkgconf/tests/lib1/fragment-group-b.pc diff --cc contrib/pkgconf/tests/lib1/fragment-group-c.pc index 000000000000,f79965be0f1d..f79965be0f1d mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-group-c.pc +++ b/contrib/pkgconf/tests/lib1/fragment-group-c.pc diff --cc contrib/pkgconf/tests/lib1/fragment-groups-2.pc index 000000000000,f73f70698f56..f73f70698f56 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-groups-2.pc +++ b/contrib/pkgconf/tests/lib1/fragment-groups-2.pc diff --cc contrib/pkgconf/tests/lib1/fragment-groups.pc index 000000000000,9645f9e9719a..9645f9e9719a mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-groups.pc +++ b/contrib/pkgconf/tests/lib1/fragment-groups.pc diff --cc contrib/pkgconf/tests/lib1/fragment-quoting-2.pc index 000000000000,49c6ac79ce76..49c6ac79ce76 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-quoting-2.pc +++ b/contrib/pkgconf/tests/lib1/fragment-quoting-2.pc diff --cc contrib/pkgconf/tests/lib1/fragment-quoting-3.pc index 000000000000,4ff59fc37e0c..4ff59fc37e0c mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-quoting-3.pc +++ b/contrib/pkgconf/tests/lib1/fragment-quoting-3.pc diff --cc contrib/pkgconf/tests/lib1/fragment-quoting-5.pc index 000000000000,22df0b3afbaa..22df0b3afbaa mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-quoting-5.pc +++ b/contrib/pkgconf/tests/lib1/fragment-quoting-5.pc diff --cc contrib/pkgconf/tests/lib1/fragment-quoting-7.pc index 000000000000,902e2f634e72..902e2f634e72 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-quoting-7.pc +++ b/contrib/pkgconf/tests/lib1/fragment-quoting-7.pc diff --cc contrib/pkgconf/tests/lib1/fragment-quoting.pc index 000000000000,5d8e70b57f82..5d8e70b57f82 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/fragment-quoting.pc +++ b/contrib/pkgconf/tests/lib1/fragment-quoting.pc diff --cc contrib/pkgconf/tests/lib1/framework-1.pc index 000000000000,fcaa00814837..fcaa00814837 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/framework-1.pc +++ b/contrib/pkgconf/tests/lib1/framework-1.pc diff --cc contrib/pkgconf/tests/lib1/framework-2.pc index 000000000000,793655a6cc36..793655a6cc36 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/framework-2.pc +++ b/contrib/pkgconf/tests/lib1/framework-2.pc diff --cc contrib/pkgconf/tests/lib1/idirafter-ordering.pc index 000000000000,c42f7022736e..c42f7022736e mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/idirafter-ordering.pc +++ b/contrib/pkgconf/tests/lib1/idirafter-ordering.pc diff --cc contrib/pkgconf/tests/lib1/idirafter.pc index 000000000000,6c37c8bffedb..6c37c8bffedb mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/idirafter.pc +++ b/contrib/pkgconf/tests/lib1/idirafter.pc diff --cc contrib/pkgconf/tests/lib1/incomplete.pc index 000000000000,40f0d91b9fc9..40f0d91b9fc9 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/incomplete.pc +++ b/contrib/pkgconf/tests/lib1/incomplete.pc diff --cc contrib/pkgconf/tests/lib1/intermediary-1.pc index 000000000000,38ee4830ca38..38ee4830ca38 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/intermediary-1.pc +++ b/contrib/pkgconf/tests/lib1/intermediary-1.pc diff --cc contrib/pkgconf/tests/lib1/intermediary-2.pc index 000000000000,188ce6b0955f..188ce6b0955f mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/intermediary-2.pc +++ b/contrib/pkgconf/tests/lib1/intermediary-2.pc diff --cc contrib/pkgconf/tests/lib1/isystem.pc index 000000000000,98416b54ff34..98416b54ff34 mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/isystem.pc +++ b/contrib/pkgconf/tests/lib1/isystem.pc diff --cc contrib/pkgconf/tests/lib1/malformed-1.pc index 000000000000,4f4a700f017d..4f4a700f017d mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/malformed-1.pc +++ b/contrib/pkgconf/tests/lib1/malformed-1.pc diff --cc contrib/pkgconf/tests/lib1/malformed-quoting.pc index 000000000000,b8a324edadda..b8a324edadda mode 000000,100644..100644 --- a/contrib/pkgconf/tests/lib1/malformed-quoting.pc +++ b/contrib/pkgconf/tests/lib1/malformed-quoting.pc diff --cc contrib/pkgconf/tests/lib1/malformed-version.pc index 000000000000,41222cc358b3..41222cc358b3 mode 000000,100644..100644 *** 267 LINES SKIPPED ***