doc: Requires.private is used for header inclusion

Document that "pkgconf --cflags" inherits paths for including headers
from dependencies listed in Requires.private.

https://github.com/pkgconf/pkgconf/issues/300
https://github.com/pkgconf/pkgconf/issues/352

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: kaniini
+patreon: kaniini
+liberapay: kaniini

.github/workflows/test.yml

@@ -0,0 +1,153 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+
+  msys2:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: MINGW64, arch: x86_64},
+          { msystem: MINGW32, arch: i686}
+        ]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msystem }}
+          update: true
+          install: >-
+            mingw-w64-${{ matrix.arch }}-meson
+            mingw-w64-${{ matrix.arch }}-ninja
+            mingw-w64-${{ matrix.arch }}-gcc
+
+      - name: Build
+        shell: msys2 {0}
+        run: |
+          # the code assumes msvc style printf atm
+          export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0
+
+          meson -Dtests=disabled _build
+          meson compile -C _build
+
+  debian-meson:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:testing
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Update system and add dependencies
+        run: |
+          apt-get update
+          apt-get install -y kyua atf-sh build-essential meson
+
+      - name: Build
+        run: |
+          meson _build -Dwerror=true
+          meson compile -C _build
+
+      - name: Run tests
+        run: |
+          meson test -v -C _build
+
+  debian-meson-asan:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:testing
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Update system and add dependencies
+        run: |
+          apt-get update
+          apt-get install -y kyua atf-sh build-essential meson
+
+      - name: Build
+        run: |
+          meson _build -Db_sanitize=address
+          meson compile -C _build
+
+      - name: Run tests
+        run: |
+          meson test -v -C _build
+        env:
+          ASAN_OPTIONS: "exitcode=7"
+
+  debian-autotools:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:testing
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Update system and add dependencies
+        run: |
+          apt-get update
+          apt-get install -y kyua atf-sh build-essential autoconf libtool
+
+      - name: Build
+        run: |
+          ./autogen.sh
+          ./configure
+          make -j9
+
+      - name: Run tests
+        run: |
+          make distcheck
+
+  alpine-meson:
+    runs-on: ubuntu-latest
+    container:
+      image: alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Update system and add dependencies
+        run: |
+          apk update
+          apk add kyua atf build-base meson
+
+      - name: Build
+        run: |
+          meson _build -Dwerror=true
+          meson compile -C _build
+
+      - name: Run tests
+        run: |
+          meson test -v -C _build
+
+  alpine-autotools:
+    runs-on: ubuntu-latest
+    container:
+      image: alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Update system and add dependencies
+        run: |
+          apk update
+          apk add kyua atf build-base autoconf automake libtool xz gzip
+
+      - name: Build
+        run: |
+          ./autogen.sh
+          ./configure
+          make -j9
+
+      - name: Run tests
+        run: |
+          make distcheck

.gitignore

@@ -1,13 +1,19 @@
+Makefile
+Makefile.in
+.dirstamp
+stamp-h*
 *.h.in~
 *.o
 *.og
 *.op
+*.lo
 *.gcno
 *.gcda
 *.gcov
 core
 .gdb_history
 
+.libs
 .deps
 
 *.exe
@@ -16,8 +22,8 @@ core
 *.orig
 *.patch
 *.rej
-/tests/run.sh
 
+# autoconf stuff
 /aclocal.m4
 /autom4te.cache/
 /buildsys.mk
@@ -26,8 +32,47 @@ core
 /config.log
 /config.status
 /configure
+/compile
+/config.guess
+/config.sub
+/depcomp
+/install-sh
+/missing
+
+# programs
+/bomtool
 /pkgconf
 /pkgconf-gcov
 /pkgconf-profile
 
-Makefile
+# libtool
+/libtool
+/ltmain.sh
+/libpkgconf.la
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+
+# pkgconfig file
+/libpkgconf.pc
+
+# autoheader
+/libpkgconf/config.h
+/libpkgconf/config.h.in
+
+# tests
+/Kyuafile
+/tests/Kyuafile
+/tests/basic
+/tests/builtins
+/tests/conflicts
+/tests/framework
+/tests/parser
+/tests/provides
+/tests/regress
+/tests/requires
+/tests/sysroot
+/tests/test_env.sh
+/tests/version

.mailmap

@@ -0,0 +1 @@
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>

.travis.yml

@@ -1,28 +0,0 @@
-language: c
-
-compiler:
-  - clang
-  - gcc
-
-addons:
-  apt:
-    packages:
-      - liblua5.2-dev
-
-sudo: required
-
-before_install:
-  scripts/install_deps.sh
-
-script:
-  - sh ./autogen.sh
-  - ./configure
-  - make distcheck
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - "irc.freenode.org#pkgconf"
-    on_success: change
-    on_failure: always

.woodpecker.yml

@@ -0,0 +1,75 @@
+pipeline:
+  debian-meson:
+    image: debian:testing
+    commands:
+      - apt-get update
+      - apt-get install -y kyua atf-sh build-essential meson
+      - meson _build -Dwerror=true
+      - meson compile -C _build
+      - meson test -v -C _build
+    when:
+      matrix:
+        IMAGE: debian
+        BUILD: meson
+
+  debian-meson-asan:
+    image: debian:testing
+    environment:
+      - ASAN_OPTIONS="exitcode=7"
+    commands:
+      - apt-get update
+      - apt-get install -y kyua atf-sh build-essential meson
+      - meson _build -Db_sanitize=address
+      - meson compile -C _build
+      - meson test -v -C _build
+    when:
+      matrix:
+        IMAGE: debian
+        BUILD: meson
+
+  debian-autotools:
+    image: debian:testing
+    commands:
+      - apt-get update
+      - apt-get install -y kyua atf-sh build-essential autoconf libtool
+      - ./autogen.sh
+      - ./configure
+      - make -j
+      - make distcheck
+    when:
+      matrix:
+        IMAGE: debian
+        BUILD: autotools
+
+  alpine-meson:
+    image: alpine
+    commands:
+      - apk add -U --no-cache kyua atf build-base meson
+      - meson _build -Dwerror=true
+      - meson compile -C _build
+      - meson test -v -C _build
+    when:
+      matrix:
+        IMAGE: alpine
+        BUILD: meson
+
+  alpine-autotools:
+    image: alpine
+    commands:
+      - apk add -U --no-cache kyua atf build-base autoconf automake libtool xz gzip
+      - ./autogen.sh
+      - ./configure
+      - make -j
+      - make distcheck
+    when:
+      matrix:
+        IMAGE: alpine
+        BUILD: autotools
+
+matrix:
+  IMAGE:
+    - debian
+    - alpine
+  BUILD:
+    - meson
+    - autotools

AUTHORS

@@ -1,4 +1,41 @@
+A. Wilcox <AWilcox@Wilcox-Tech.com>
+Alexander Tsoy <alexander@tsoy.me>
+Alexpux <alexey.pawlow@gmail.com>
+Alon Bar-Lev <alon.barlev@gmail.com>
+Alyx <alyx@malkier.net>
+Ariadne Conill <ariadne@dereferenced.org>
 Baptiste Daroussin <bapt@FreeBSD.org>
-Jeff Horelick <jdhore@gentoo.org>
-Michał Górny <mgorny@gentoo.org
-William Pitcock <nenolod@atheme.org>
+Baptiste Daroussin <bapt@gandi.net>
+Bryan Drewery <bryan@shatow.net>
+Dag-Erling Smørgrav <des@des.no>
+Dan Kegel <dank@kegel.com>
+Dan Kegel <dank@oblong.com>
+Dan Nicholson <dbn.lists@gmail.com>
+David Michael <fedora.dm0@gmail.com>
+Emil Renner Berthing <esmil@mailme.dk>
+Fabian Groffen <grobian@gentoo.org>
+Graham Ollis <plicease@cpan.org>
+Gregor Richards <Richards@codu.org>
+Ignacio Casal Quinteiro <qignacio@amazon.com>
+Igor Gnatenko <ignatenko@redhat.com>
+Issam Maghni <concatime@users.noreply.github.com>
+JD Horelick <jdhore1@gmail.com>
+Jason Dusek <jason.dusek@gmail.com>
+Javier Viguera <javier.viguera@digi.com>
+Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
+John Hein <jhgit@users.github.com>
+Jussi Pakkanen <jpakkane@gmail.com>
+Leorize <alaviss@users.noreply.github.com>
+Luca Barbato <lu_zero@gentoo.org>
+Marcin Wojdyr <wojdyr@gmail.com>
+Maxin B. John <maxinbjohn@users.noreply.github.com>
+Michał Górny <mgorny@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+Seungha Yang <seungha.yang@navercorp.com>
+TingPing <tingping@tingping.se>
+Tobias Kortkamp <t6@users.noreply.github.com>
+Tony Theodore <tonyt@logyst.com>
+Volker Braun <vbraun.name@gmail.com>
+Yu Kobayashi <yukoba@accelart.jp>
+orbea <orbea@fredslev.dk>
+✈ Graham ✈ <plicease@cpan.org>

CODE_OF_CONDUCT.md

@@ -0,0 +1,27 @@
+# pkgconf Code of Conduct
+
+We invite and encourage everybody to express their opinions on relevant
+topics.  All participants should at all times feel at ease to do so without
+fearing any form of attack, reprisal or harassment.  We ask everybody to be
+respectful and considerate towards each other, especially when attempting
+to provide constructive criticism.
+
+To foster tolerance, respect and hospitality in our community, we agree not
+to engage in discriminatory, disparaging or offensive speech or actions,
+including as to (but not limited to) gender, sexuality, race, nationality,
+religion or profession. We are a community of many different nationalities
+and backgrounds, and we cherish our strength in diversity. 
+
+
+## Reporting incidents
+
+Please report any incidents which may be perceived as violations to
+`ariadne+conduct@dereferenced.org`.  Incidents will be investigated and,
+if warranted, acted upon.
+
+
+## Credits
+
+This CoC is derived from the [FSFE Code of Conduct][fsfe-coc].
+
+   [fsfe-coc]: https://fsfe.org/about/codeofconduct.en.html

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017
+Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
     pkgconf authors (see AUTHORS file in source directory).
 
 Permission to use, copy, modify, and/or distribute this software for any

Makefile.am

@@ -4,21 +4,31 @@ datadir                = @datadir@
 includedir             = @includedir@
 system_includedir      = @SYSTEM_INCLUDEDIR@
 system_libdir          = @SYSTEM_LIBDIR@
-pkg_default_dir        = @PKGCONFIGDIR@
+pkg_default_dir        = @PKG_DEFAULT_PATH@
+personality_dir        = @PERSONALITY_PATH@
 pkgconfigdir           = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA  = libpkgconf.pc
 
-AM_CFLAGS = -Wall -Wextra -Wformat=2 -std=gnu99 -DPKG_DEFAULT_PATH=\"$(pkg_default_dir)\" -DSYSTEM_INCLUDEDIR=\"$(system_includedir)\" -DSYSTEM_LIBDIR=\"$(system_libdir)\"
+AM_CFLAGS = -DPERSONALITY_PATH=\"$(personality_dir)\" -DPKG_DEFAULT_PATH=\"$(pkg_default_dir)\" -DSYSTEM_INCLUDEDIR=\"$(system_includedir)\" -DSYSTEM_LIBDIR=\"$(system_libdir)\"
 
-bin_PROGRAMS = pkgconf
+bin_PROGRAMS = pkgconf bomtool
 lib_LTLIBRARIES = libpkgconf.la
 
 EXTRA_DIST =	pkg.m4 \
+		meson.build \
+		meson_options.txt \
+		libpkgconf/meson.build \
+		libpkgconf/config.h.meson \
+		libpkgconf/win-dirent.h \
+		tests/lib-relocatable/lib/pkgconfig/foo.pc \
 		tests/lib1/argv-parse-2.pc \
+		tests/lib1/billion-laughs.pc \
 		tests/lib1/dos-lineendings.pc \
 		tests/lib1/paren-quoting.pc \
 		tests/lib1/argv-parse-3.pc \
 		tests/lib1/foo.pc \
+		tests/lib1/foobar.pc \
+		tests/lib1/unavailable-provider.pc \
 		tests/lib1/prefix-foo1.pc \
 		tests/lib1/argv-parse.pc \
 		tests/lib1/framework-1.pc \
@@ -40,6 +50,7 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/sysroot-dir.pc \
 		tests/lib1/circular-2.pc \
 		tests/lib1/multiline.pc \
+		tests/lib1/multiline-bogus.pc \
 		tests/lib1/tilde-quoting.pc \
 		tests/lib1/circular-3.pc \
 		tests/lib1/no-trailing-newline.pc \
@@ -53,6 +64,7 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib3/bar.pc \
 		tests/lib1/conflicts.pc \
 		tests/lib1/omg-uninstalled.pc \
+		tests/lib1/omg-sysroot-uninstalled.pc \
 		tests/lib1/isystem.pc \
 		tests/lib1/idirafter.pc \
 		tests/lib1/idirafter-ordering.pc \
@@ -63,7 +75,41 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/provides-request-simple.pc \
 		tests/lib1/flag-order-1.pc \
 		tests/lib1/flag-order-3.pc \
-		tests/test_env.sh \
+		tests/lib1/variable-whitespace.pc \
+		tests/lib1/fragment-collision.pc \
+		tests/lib1/fragment-collision-intermediary.pc \
+		tests/lib1/fragment-collision-1.pc \
+		tests/lib1/fragment-collision-2.pc \
+		tests/lib1/fragment-comment.pc \
+		tests/lib1/fragment-escaping-1.pc \
+		tests/lib1/fragment-escaping-2.pc \
+		tests/lib1/fragment-escaping-3.pc \
+		tests/lib1/fragment-quoting.pc \
+		tests/lib1/fragment-quoting-2.pc \
+		tests/lib1/fragment-quoting-3.pc \
+		tests/lib1/fragment-quoting-5.pc \
+		tests/lib1/fragment-quoting-7.pc \
+		tests/lib1/malformed-1.pc \
+		tests/lib1/malformed-quoting.pc \
+		tests/lib1/malformed-version.pc \
+		tests/lib1/metapackage.pc \
+		tests/lib1/metapackage-1.pc \
+		tests/lib1/metapackage-2.pc \
+		tests/lib1/metapackage-3.pc \
+		tests/lib1/explicit-sysroot.pc \
+		tests/lib1/escaped-backslash.pc \
+		tests/lib1/cflags-internal.pc \
+		tests/lib1/requires-internal.pc \
+		tests/lib1/requires-internal-2.pc \
+		tests/lib1/requires-internal-missing.pc \
+		tests/lib1/requires-internal-collision.pc \
+		tests/lib1/tuple-quoting.pc \
+		tests/lib1/empty-tuple.pc \
+		tests/lib1/orphaned-requires-private.pc \
+		tests/lib1/sysroot-dir-2.pc \
+		tests/lib1/sysroot-dir-3.pc \
+		tests/lib1/sysroot-dir-4.pc \
+		tests/lib1/sysroot-dir-5.pc \
 		$(test_scripts) \
 		doc/conf.py \
 		doc/extract.py \
@@ -80,7 +126,7 @@ EXTRA_DIST =	pkg.m4 \
 		doc/libpkgconf-queue.rst \
 		doc/libpkgconf-tuple.rst
 
-test_scripts=	\
+test_scripts=	tests/meson.build \
 		tests/basic.sh \
 		tests/builtins.sh \
 		tests/conflicts.sh \
@@ -92,11 +138,12 @@ test_scripts=	\
 		tests/sysroot.sh \
 		tests/version.sh
 
-check_SCRIPTS=	$(test_scripts:.sh=)
+test_sh = $(filter-out tests/meson.build, $(test_scripts))
+check_SCRIPTS = $(test_sh:.sh=)
 
 SUFFIXES=	.sh
 
-nobase_pkginclude_HEADERS = libpkgconf/bsdstubs.h libpkgconf/iter.h libpkgconf/libpkgconf.h libpkgconf/stdinc.h
+nobase_pkginclude_HEADERS = libpkgconf/bsdstubs.h libpkgconf/iter.h libpkgconf/libpkgconf.h libpkgconf/stdinc.h libpkgconf/libpkgconf-api.h
 libpkgconf_la_SOURCES  =	\
 		libpkgconf/audit.c		\
 		libpkgconf/cache.c		\
@@ -109,14 +156,32 @@ libpkgconf_la_SOURCES  =	\
 		libpkgconf/tuple.c		\
 		libpkgconf/dependency.c		\
 		libpkgconf/queue.c		\
-		libpkgconf/path.c
-libpkgconf_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^pkgconf_'
+		libpkgconf/path.c		\
+		libpkgconf/personality.c	\
+		libpkgconf/parser.c
+libpkgconf_la_LDFLAGS = -no-undefined -version-info 5:0:0 -export-symbols-regex '^pkgconf_'
+
+dist_man_MANS    = 		\
+	man/pkgconf.1		\
+	man/pkg.m4.7		\
+	man/pc.5		\
+	man/pkgconf-personality.5
 
-dist_man_MANS    = pkgconf.1
 pkgconf_LDADD    = libpkgconf.la
-pkgconf_SOURCES  = main.c getopt_long.c
-pkgconf_CPPFLAGS = -Ilibpkgconf
-noinst_HEADERS   = getopt_long.h
+pkgconf_SOURCES  = \
+	cli/main.c				\
+	cli/getopt_long.c			\
+	cli/renderer-msvc.c
+pkgconf_CPPFLAGS = -I$(top_srcdir)/libpkgconf -I$(top_srcdir)/cli
+noinst_HEADERS   = \
+	cli/getopt_long.h			\
+	cli/renderer-msvc.h
+
+bomtool_LDADD    = libpkgconf.la
+bomtool_SOURCES  = \
+	cli/bomtool/main.c				\
+	cli/getopt_long.c
+bomtool_CPPFLAGS = -I$(top_srcdir)/libpkgconf -I$(top_srcdir)/cli -I$(top_srcdir)/cli/bomtool
 
 dist_doc_DATA = README.md AUTHORS
 

Makefile.lite

@@ -0,0 +1,77 @@
+# Copyright (c) 2019 William Pitcock <nenolod@dereferenced.org>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# This software is provided 'as is' and without any warranty, express or
+# implied.  In no event shall the authors be liable for any damages arising
+# from the use of this software.
+
+# pkgconf-lite is a staticly-linked version of pkgconf that does not include
+# all features, notably it does not include cross-compile support and MSVC
+# support.  It does not include the libpkgconf library.
+
+SRCS = \
+	libpkgconf/argvsplit.c		\
+	libpkgconf/audit.c		\
+	libpkgconf/bsdstubs.c		\
+	libpkgconf/cache.c		\
+	libpkgconf/client.c		\
+	libpkgconf/dependency.c		\
+	libpkgconf/fileio.c		\
+	libpkgconf/fragment.c		\
+	libpkgconf/parser.c		\
+	libpkgconf/path.c		\
+	libpkgconf/personality.c	\
+	libpkgconf/pkg.c		\
+	libpkgconf/queue.c		\
+	libpkgconf/tuple.c		\
+	cli/getopt_long.c		\
+	cli/main.c
+OBJS = ${SRCS:.c=.o}
+CFLAGS = ${STATIC} -DPKGCONF_LITE -I. -Ilibpkgconf -Icli -DSYSTEM_LIBDIR=\"${SYSTEM_LIBDIR}\" -DSYSTEM_INCLUDEDIR=\"${SYSTEM_INCLUDEDIR}\" -DPKG_DEFAULT_PATH=\"${PKG_DEFAULT_PATH}\"
+STATIC =
+STRIP = strip
+
+all: pkgconf-lite
+
+libpkgconf/config.h:
+	@echo '#define PACKAGE_NAME "pkgconf-lite"' >> $@
+	@echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues"' >> $@
+	@echo '#define PACKAGE_VERSION "2.2.0"' >> $@
+	@echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@
+	@echo '#define HAVE_STRLCPY' >> $@
+	@echo '#define HAVE_STRLCAT' >> $@
+	@echo '#define HAVE_STRNDUP' >> $@
+
+pkgconf-lite: preflight libpkgconf/config.h ${OBJS}
+	${CC} ${STATIC} -o $@ ${OBJS}
+	${STRIP} $@
+
+clean:
+	rm -f libpkgconf/config.h
+	rm -f ${OBJS}
+	rm -f pkgconf-lite
+
+preflight: preflight-system-libdir preflight-system-includedir preflight-pkg-default-path
+
+preflight-system-libdir:
+	@if test -z "${SYSTEM_LIBDIR}"; then		\
+		echo "SYSTEM_LIBDIR not set.";		\
+		exit 1;					\
+	fi
+
+preflight-system-includedir:
+	@if test -z "${SYSTEM_INCLUDEDIR}"; then	\
+		echo "SYSTEM_INCLUDEDIR not set.";	\
+		exit 1;					\
+	fi
+
+preflight-pkg-default-path:
+	@if test -z "${PKG_DEFAULT_PATH}"; then		\
+		echo "PKG_DEFAULT_PATH not set.";	\
+		exit 1;					\
+	fi
+
+.PHONY: preflight preflight-system-libdir preflight-system-includedir preflight-pkg-default-path clean

NEWS

@@ -1,6 +1,628 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 2.1.1 to 2.2.0:
+----------------------------
+
+* libpkgconf SOVERSION is now 5.
+
+* Significant solver rework to flatten both requires and requires.private
+  dependencies in a single pass.  Improves performance slightly and ensures
+  proper dependency order.
+  Patches by Kai Pastor.
+
+* Improve `--digraph` output to reflect more of the solver's state in the
+  rendered dependency graph.
+  Patches by Kai Pastor.
+
+* Do not reference the graph root by name when presenting error messages about
+  directly requested dependency nodes.
+  Patch by Kai Pastor.
+
+Changes from 2.1.0 to 2.1.1:
+----------------------------
+
+* Documentation fixes from Sam James and Stefan Weil.
+
+* Fix --modversion with constraints.
+  Patch by Kai Pastor.
+
+* Reintroduce an optimization to the dependency graph walker which avoids
+  revisiting already visited nodes.
+  Patch by Yi Chou with some modifications.
+
+* Add a regression test to check that the dependency flattener is working
+  as expected.
+  Patch by Kai Pastor.
+
+Changes from 2.0.3 to 2.1.0:
+----------------------------
+
+* Do not flatten the solver solution into the original world used as
+  input to the solver.
+  Patches by Kai Pastor.
+
+* Fix warnings with GCC 14 -Walloc-size.
+  Patch by Sam James.
+
+* Add --solution to the pkgconf CLI to dump the solver state.
+
+* Improve the --digraph output to clarify cancelled edges in a given
+  solution.
+
+* Demote requires dependencies to requires.private when a parent
+  dependency is pulled in via requires.private.
+
+* Trim trailing whitespace when processing package arguments.
+  Patch by Colin Gillespie.
+
+* Avoid strncmp() in --modversion version comparison.
+  Patch by Colin Gillespie.
+
+* Update autoconf compile flag checking macro.
+  Patch by Peter Kokot.
+
+* Add system default path configuration to Meson.
+  Patch by L. E. Segovia.
+
+* Fix order of PKG_CONFIG_LIBDIR and PKG_CONFIG_PATH element processing.
+
+Changes from 2.0.2 to 2.0.3:
+----------------------------
+
+* Fix some edge-cases with the new `--modversion` implementation
+  and add additional regression tests.
+  Patch by Colin Gillespie.
+
+* Fix some format specifiers to use PRIu64 in debug tracing.
+
+Changes from 2.0.1 to 2.0.2:
+----------------------------
+
+* Fix long-standing bug where package identifiers for "uninstalled"
+  packages incorrectly included the "-uninstalled" suffix.
+
+  This was exposed by the recent change to `--modversion` in 2.0.1.
+
+Changes from 2.0.0 to 2.0.1:
+----------------------------
+
+* The behavior of --modversion was largely reverted back to the traditional
+  pkg-config behavior, but still operates on a solved dependency graph.
+
+  The order of --modversion output is based on the dependency resolution
+  queue which is passed to the solver, which itself generally maps to the
+  order of the constrants provided on the command line.
+
+* A new flag, --verbose, has been added.  When used with `--modversion`, it
+  is possible to disambiguate which version belongs to which module:
+
+    % pkgconf --modversion --verbose foo bar
+    foo: 1.2.3
+    bar: 1.3
+
+Changes from 1.9.5 to 2.0.0:
+----------------------------
+
+* When flattening the dependency graph, retain the latest seen edges
+  rather than the earliest.
+
+* Fix a long-standing bug where the dependency resolution queue was
+  evaluated in reverse.  This bug masked the aforementioned dependency
+  flattening bug in many cases.
+
+* Fix handling of --with-path, which was appending paths to the search
+  list rather than prepending them as intended.
+
+* Error when --modversion is requested with more than one package, as
+  the output is ambiguous.
+
+Changes from 1.9.4 to 1.9.5:
+----------------------------
+
+* Fix incorrect assumptions involving the use of ctype(3) functions.
+  Patch by Taylor R Campbell.
+
+* Fix detection of provided functions on autoconf.
+  Patches by Harmen Stoppels.
+
+* Fix deletion of tests/meson.build by the autoconf build system.
+  Patch by h30032433.
+
+* Fix quoting rules in argvsplit.c.
+  Patch by huyubiao.
+
+* Update libpkgconf documentation and documentation building scripts.
+  Patches by Andrew Shadura.
+
+* Enforce maximum package count correctly for --modversion.
+
+Changes from 1.9.3 to 1.9.4:
+----------------------------
+
+* Fix a buffer overflow vulnerability involving very large variable expansions.
+  CVE-2023-24056
+
+* Fix a bunch of minor regressions with the solver.
+
+* Create separate solutions for `--cflags` and `--libs` when `--static` is not
+  used.
+
+* Remove final trailing whitespace in pkgconf_fragment_render_buf().
+
+* Revert broken pkg.m4 change involving querying module versions in
+  PKG_CHECK_MODULES.
+
+* Fix handling of tildes in version strings.
+
+* Various C99 formatting string fixes involving SIZE_FMT_SPECIFIER.
+
+Changes from 1.9.2 to 1.9.3:
+----------------------------
+
+* Fix a bunch of minor code issues pointed out using Clang static analyzer.
+
+* New API: pkgconf_solution_free(), which frees a compiled solution graph.
+
+* Fix behavior when overriding global variables with `--define-variable`.
+
+Changes from 1.9.1 to 1.9.2:
+----------------------------
+
+* Do not try to break dependency cycles across dependency lists.  This causes
+  the solved graph to sometimes miss required dependency nodes because the
+  solver detected an incorrect dependency cycle.
+
+* New API: pkgconf_queue_solve(), which replaces pkgconf_queue_apply().
+  pkgconf_queue_apply is now deprecated and should not be used in new code.
+
+Changes from 1.9.0 to 1.9.1:
+----------------------------
+
+* Skip graph flattening and traversal for query types which only make sense
+  for a single pkg-config module.
+
+  The old solver walked these graphs with --maximum-traverse-depth=1 in
+  these cases, but this is no longer helpful because the graph is flattened
+  by the new solver.
+
+Changes from 1.8.0 to 1.9.0:
+----------------------------
+
+* pkgconf 1.9.0 is the first testing release in the pkgconf 2.0 development
+  series.  While it is believed to be suitable for production, there may be
+  bugs due to the overall redesign of the solver and other initiatives.
+  Additionally, a future release of pkgconf plans will have additional ABI
+  breaks for the libpkgconf library before the pkgconf 2.0 release is cut.
+
+* There is now a new solver that is designed to provide higher performance
+  with complicated graphs, which works by flattening the dependency graph
+  into a smaller set of dependencies.  This graph can then be evaluated
+  instead of the original dependency graph without having to visit every
+  edge in the graph.
+
+  NOTE: This solver, while providing significant performance improvements,
+  does so, at the cost of changed behavior for some edge cases (such as
+  circular dependencies).
+
+* Bug fixes:
+  - Resolved several memory leaks with edge cases when using libpkgconf
+    directly.
+  - pkgconf CLI now consistently frees libpkgconf resources under all
+    circumstances.
+  - SYSROOT rules are no longer applied to `-uninstalled` packages by
+    default.  Use `PKG_CONFIG_PKGCONF1_SYSROOT_RULES` for legacy behavior.
+
+* A new `--license` selector has been added to the pkgconf CLI.  This uses
+  SPDX expressions which can be set as the `License` field in `.pc` files.
+  See the `pc(5)` manpage for more information.
+
+* The canonical location for pkgconf maintenance going forward is
+  <https://gitea.treehouse.systems/ariadne/pkgconf>.  This is presently
+  mirrored to GitHub for user convenience, but that mirroring will
+  be terminated at some point (due to GitHub Copilot).
+
+Changes from 1.7.4 to 1.8.0:
+----------------------------
+
+* This is the last planned maintenance branch.  I see pkgconf as basically
+  a finished tool at this point, and very few people were ultimately interested
+  in libpkgconf.  So, from here on out, it will just be bug fixes only and
+  very minor enhancements.
+
+* Bug fixes:
+  - Improved path handling on Windows to conform to what the MSYS2
+    and Cygwin teams were already modifying pkgconf to do.
+    Patches by Christoph Reiter.
+  - Fix a minor memory leak relating to cross-personalities.
+    Patch by Stone Tickle.
+  - Fix static builds for Windows on Meson.
+    Patch by Alexander Neumann.
+  - Fix some edge cases with --redefine-prefix.
+    Patch by midipix.
+  - Do not prepend sysroot_dir if the .pc file does not exist in the
+    sysroot.
+    Patch by Sandro Mani.
+  - Do not perform path filtering on default system include and library
+    path lists.  This fixes consistency with other mechanisms that modify
+    these path lists.
+
+* Enhancements:
+  - Document the --validate option in the manpage.
+    Patch by orbea.
+
+Changes from 1.7.3 to 1.7.4:
+----------------------------
+
+* Bug fixes:
+  - Fix null-dereference crash when pulling a malformed 'uninstalled'
+    .pc file into a dependency tree.  Patch by Tobias Stöckmann.
+  - Fix truncation of comment characters when quoted.
+  - Fix handling of .pc module names in --list-all on Windows.
+    Patch by Ryan Scott.
+  - Handle platforms where realpath(3) requires a pre-allocated buffer.
+    Patch by Fabian Groffen.
+  - Fix version whitespace warning.
+    Patch by Christoph Reiter.
+
+* Enhancements:
+  - Rewrite DOS paths on native Windows builds that don't use
+    Cygwin/MSYS.
+  - Add WantDefaultPure cross-compiler personality option.
+  - Prefer --static --pure linking on Windows.
+  - Add PKG_CONFIG_DONT_DEFINE_PREFIX environment variable.
+    Patch by Jeff Moguillansky.
+  - Many improvements when building pkgconf with Meson.
+    Patches by Christoph Reiter.
+
+Changes from 1.7.2 to 1.7.3:
+----------------------------
+
+* Bug fixes:
+  - Fix a possible out of boundary write when evaluating dependencies.
+    Patch by Tobias Stöckmann.
+  - Fix escaping logic on Windows.  Patch by Vincent Torri.
+  - Fix out of boundary reads and writes with a malformed fragment.
+    Patches by Tobias Stöckmann.
+  - Fix a possible out of boundary write when evaluating tuples.
+    Patch by Tobias Stöckmann.
+
+Changes from 1.7.1 to 1.7.2:
+----------------------------
+
+* Bug fixes:
+  - Fix a windows-specific crash relating to path fixups.
+
+Changes from 1.7.0 to 1.7.1:
+----------------------------
+
+* Bug fixes:
+  - Fix a possible out of boundary access in the parser for the
+    cross-compile database.  Patch by Tobias Stöckmann.
+  - Missing files for building with Meson are now included in the
+    tarball.  Patch by Neal Gompa.
+  - Fix calculation of package atoms on Windows with paths that
+    use both directory separator characters.
+
+Changes from 1.6.3 to 1.7.0:
+----------------------------
+
+* Bug fixes:
+  - Fix a possible buffer overflow involving newline escaping.
+    Patch by Tobias Stöckmann.
+  - Fix an out of boundary access in the parser.
+    Patch by Tobias Stöckmann.
+  - Fix leakage of strcmp() result value in pkgconf_compare_version()
+    responses.
+  - Return the default personality if loading a cross-compile
+    personality file failed.
+  - Do not complain about newlines when validating package versions.
+  - Properly detect strndup() on Windows when building with Meson.
+
+* Enhancements:
+  - A new --shared option and WantDefaultStatic cross-compile
+    configuration option have been added.  This allows for toolchains
+    to specify that static linking should be used by default.
+  - Support for the PKG_CONFIG_MSVC_SYNTAX environment variable has
+    been added.  Patch by Dan Kegel.
+  - Support for the PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS
+    client flag which disables emulation of freedesktop.org pkg-config
+    fragment merging semantics has been added.
+    Patch by Karen Arutyunov.
+
+Changes from 1.6.2 to 1.6.3:
+----------------------------
+
+* Bug fixes:
+  - Properly tokenize versions.  Versions cannot logically contain
+    whitespace, as dependency-lists would not properly tokenize if
+    they could.  A diagnostic is generated for malformed version
+    strings containing whitespace when --validate is used.
+
+* Enhancements:
+  - CMake support has been dropped.  Use Meson to build on Windows.
+
+Changes from 1.6.1 to 1.6.2:
+----------------------------
+
+* Bug fixes:
+  - Fixed a memory leak when deduplicating paths.
+  - Fixed strndup-related build regression on Windows.
+
+* Enhancements:
+  - Added pkgconf-lite variant.  pkgconf-lite is a stripped down
+    variant of pkgconf that only includes pkg-config features.
+  - Added --modversion description to pkgconf(1) man page.
+
+Changes from 1.6.0 to 1.6.1:
+----------------------------
+
+* Bug fixes:
+  - Fixed an issue where a personality may not be properly selected
+    due to argv[0] containing a full path.
+  - Fixed a regression where having an empty PKG_CONFIG_LIBDIR
+    environment variable would not eliminate the default search
+    paths.
+  - Use POSIX realpath(3) instead of readlink() for deduplicating the
+    search path.  Use _fullpath() on Windows for the same purpose.
+  - The dequoting logic for tuples has been improved to ensure that
+    quotes *inside* a value remain quoted when necessary.
+
+Changes from 1.5.4 to 1.6.0:
+----------------------------
+
+* Bug fixes:
+  - Fixed issue where packages which referenced missing packages in
+    Requires.private may have crashed due to memory corruption issues
+    in some circumstances.
+  - Fixed warnings reported by GCC 8 diagnostics.
+
+* Enhancements:
+  - Add LIBPKGCONF_VERSION and LIBPKGCONF_VERSION_STR macros for
+    determining libpkgconf version.
+  - Add pkgconf_fragment_copy_list() to copy a fragment list to
+    another fragment list.
+
+Changes from 1.5.3 to 1.5.4:
+----------------------------
+
+* Bug fixes:
+  - fix build on Windows with Meson
+  - fix edge cases for path canonicalization (especially on Windows)
+
+Changes from 1.5.2 to 1.5.3:
+----------------------------
+
+* Security fixes:
+  - Fix edge cases involving dequoting zero-length tuples that can lead to a
+    buffer overflow under the right circumstances.  Thanks to A. Wilcox for
+    reporting and supplying a patch.  (MR 3)
+
+Changes from 1.5.1 to 1.5.2:
+----------------------------
+
+* Bug fixes:
+  - Ensure environment variables override values learned from personality files
+    or built-in defaults.
+
+* Documentation enhancements:
+  - Add pkgconf-personality(5) manpage documenting the personality file format.
+
+Changes from 1.5.0 to 1.5.1:
+----------------------------
+
+* Bug fixes:
+  - fixed a crash with some invalid multi-line .pc files
+
+Changes from 1.4.2 to 1.5.0:
+---------------------------
+
+* Administrative:
+  - The git repository has moved to <https://git.dereferenced.org/pkgconf/pkgconf>,
+    due to the acquisition of GitHub by Microsoft.
+
+* Overall enhancements:
+  - pkgconf now supports the proposed Requires.internal pkg-config extension,
+    by merging it with the Requires.private list (there is no functional difference
+    between the two in our resolver implementation)
+  - Support for cross-compilation personalities have been added.  To make use of this
+    functionality, create a file in the new personality.d directory that sits inside
+    the pkgconfig directory.  The personality file format is described in
+    pc-personality(5). (github #166)
+  - Support for Haiku has been added, including interpretation of BELIBRARIES and
+    other toolchain specifics. (github #180)
+  - Testsuite support can be disabled when building with Meson. (github #175)
+
+* Bug fixes:
+  - tuples are now appropriately dequoted when added by the parser (github #186).
+
+* Various Windows enhancements:
+  - CMake supports building with GCC on Windows. (github #179)
+  - Prefix rewriting has been improved. (github #177)
+  - PKGCONF_API support has been implemented when building with Meson,
+    allowing Meson to be used to build pkgconf on Windows. (github #174)
+
+* Documentation fixes:
+  - The manpages have been linted and fixed. (github #181, #182, #183)
+  - The description of pkgconf --exists has been corrected. (github #173)
+
+Changes from 1.4.1 to 1.4.2:
+----------------------------
+
+* Bug fixes:
+  - ensure pkgconf_dependency_t nodes have a solution marked when satisfied
+    by an indirect provider (github #172)
+
+Changes from 1.4.0 to 1.4.1:
+----------------------------
+
+* Bug fixes:
+  - revert some quoting changes because they don't work well with certain
+    GCC edge cases (github #168)
+
+* Enhancements:
+  - add limited support for --cflags with --msvc-syntax
+
+Changes from 1.3.7 to 1.4.0:
+----------------------------
+
+* Notable libpkgconf API changes:
+  - pkgconf_pkg_t.requires has been renamed to pkgconf_pkg_t.required for
+    C++20 compatibility.
+
+* Enhancements:
+  - pkgconf and libpkgconf has been ported to Windows as native binaries.
+  - improved compatibility with freedesktop.org pkg-config's ${pc_sysrootdir}
+    usage pattern.
+  - do not mention PKG_CONFIG_SKIP_CONFLICTS environmental variable when
+    simplified errors are requested, as with PKG_CONFIG_PATH.
+  - the dependency solver now stores solutions to dependency graph elements
+    it visits, allowing for the dependency graph to be incrementally solved.
+    this improves dependency solving time by an order of magnitude in most
+    cases.
+  - new --env option allows for exporting cflags/libs fragments as export
+    variables
+  - new support for building pkgconf with CMake and Meson
+  - improved compiler warning flag detection on autoconf and CMake
+  - removed PKGCONF_BUFSIZE allocations from the stack where possible
+  - allow for customizing the way fragment lists are rendered using a callback API
+  - new support for --msvc-syntax output using the new fragment rendering callbacks
+  - fragments are now quoted according to POSIX literal rules
+  - new variables on the pkg-config builtin:
+    - ${pc_system_includedirs}: the system includedir search path known by pkgconf
+    - ${pc_system_libdirs}: the system libdir search path known by pkgconf
+  - new manpages:
+    - pc(5) describing pkgconf's interpretation of pkg-config .pc files
+    - pkg.m4(7) describing the autotools macros bundled with pkgconf
+
+* Bug fixes:
+  - fix pkgconf_pkg_t.id generation on native Windows where either \ or / are usable
+    as path separator.
+  - add missing --modversion to --help output
+  - do not evaluate module paths for modules that are not actually on disk
+  - ensure we work on a zeroed buffer prior to calling realpath(2) with it
+  - fix path deduplication edge case when cache-inodes feature is unavailable
+  - fix path rewriting regression with PKG_CONFIG_SYSROOT_DIR when
+    PKG_CONFIG_SYSROOT_DIR is set to /
+  - fix crash in edge case where a .pc file has misquoting in a fragment list.
+  - fix logic edge case when comparing relocated paths
+
+Changes from 1.3.6 to 1.3.7:
+----------------------------
+
+* Enhancements:
+  - improved diagnostics for malformed packages.
+
+* Bug fixes:
+  - reject packages which contain incomplete metadata in post-parse phase.
+
+Changes from 1.3.5 to 1.3.6:
+----------------------------
+
+* Enhancements:
+  - add many cflags to the protected set: -Wa, -Wl, -Wp, -ansi, -std=, -stdlib=,
+    -pedantic, -pthread, -trigraphs, -nostdinc, -nostdlibinc, -nobuiltininc.
+
+* Bug fixes:
+  - handle -include cflag fragments properly.
+
+Changes from 1.3.4 to 1.3.5:
+----------------------------
+
+* Bug fixes:
+  - fix --variable output for compatibility some broken configure scripts when they
+    request the same variable from multiple packages
+
+Changes from 1.3.3 to 1.3.4:
+----------------------------
+
+* Bug fixes:
+  - fix a quoting issue exposed by the Go testsuite
+
+Changes from 1.3.2 to 1.3.3:
+----------------------------
+
+* Bug fixes:
+  - back out disabling the dependency resolver for single-package queries, it caused
+    too many regressions.
+
+* Enhancements:
+  - allow explicitly disabling the dependency resolver via new environment variable,
+    PKG_CONFIG_MINIMUM_TRAVERSE_DEPTH=1.  while pkgconf could already do this using
+    --minimum-traverse-depth=1, other pkg-config implementations do not have this
+    option, so adding an environment variable allows to make better use of this
+    feature (other implementations won't error due to unknown option this way)
+
+Changes from 1.3.1 to 1.3.2:
+----------------------------
+
+* Bug fixes:
+  - rewrite handling of --modversion, --print-variables and --variable to not require
+    the dependency resolver
+  - ensure we disable the dependency resolver in all cases where it is a single-package
+    query (1.3.1 did not go far enough)
+
+Changes from 1.3.0 to 1.3.1:
+----------------------------
+
+* Features:
+  - implement --short-errors
+
+* Bug fixes:
+  - only consider a single package at a time with --print-requires, --print-requires-private,
+    --print-provides, --modversion, --print-variable and --print-variables
+
+* Enhancements:
+  - synchronized latest freedesktop.org changes to pkg.m4
+  - improve error reporting with legacy --atleast-version and similar flags.
+
+Changes from 1.2.0 to 1.3.0:
+----------------------------
+
+* Features:
+  - pkgconf --debug now provides a facility for tracing most relevant libpkgconf operations
+  - libpkgconf: add warn and trace handlers for warnings
+  - replace realpath() with faster, lighter weight path normalization function (github #112)
+  - pkgconf CLI now emulates pkg-config quoting rules precisely, while allowing direct access
+    to the actual fragments via libpkgconf
+
+* Bug fixes:
+  - pkg: properly separate static and virtual packages so they are not inappropriately
+    optimized out of the dependency graph (github #108)
+  - argvsplit: do not consider ' and " to have similar rules to escape sequences (github #111)
+  - pkg: strip trailing whitespace when parsing .pc files
+
+* Enhancements:
+  - argvsplit basically rewritten from scratch
+  - many code fixes spotted by coverity
+  - add PKG_CONFIG_DONT_RELOCATE_PATHS and --dont-relocate-paths environment variables to
+    disable path relocation feature if needed
+  - remove extra whitespace that was present for compatibility with older pkg-config releases
+    (github #113)
+
+Changes from 1.1.0 to 1.2.0:
+----------------------------
+
+* Features:
+  - new --path option lists the .pc files which provided the requested dependencies
+  - new path relocation API: pkgconf_path_relocate(), which wraps functions such as
+    realpath() and cygwin_conv_path().
+  - new --with-path option adds a path to the search list
+  - new --define-prefix and --dont-define-prefix features enable automatic prefix
+    detection for relocatable SDKs.  this is mostly useful on windows.
+
+* Bug fixes:
+  - fragments: fix even more edge cases involving token concatenation
+  - path lists: don't attempt to collect path inodes if the filter is disabled
+  - path lists: explicitly avoid uninitialised data for the path inode cache
+  - client: properly handle --keep-system-cflags and --keep-system-libs
+
+* Enhancements:
+  - windows: build libpkgconf as a DLL
+  - fragments: only munge fragments if sysroot_dir is actually set
+  - overall API: resolver flags have been moved to being a client-object setting
+    instead of used for every function invocation
+
 Changes from 1.0.1 to 1.1.0:
 ----------------------------
 
@@ -19,17 +641,18 @@ Changes from 1.0.1 to 1.1.0:
   - filter duplicate PKG_CONFIG_PATH (and other) entries by inode
 
 * Bug fixes:
-  - fragments: fix another edge case involving empty tokens being concatenated onto previous tokens (#99)
+  - fragments: fix another edge case involving empty tokens being concatenated onto previous tokens
+    (github #99)
   - libpkgconf: remove dependencies on config.h in public headers
 
 Changes from 1.0.0 to 1.0.1:
 ----------------------------
 
 * Enhancements:
-  - new stub implementation of --print-provides (#95)
+  - new stub implementation of --print-provides (github #95)
 
 * Bug fixes:
-  - fragments: fix an edge case involving path-only fragments and PKG_CONFIG_SYSROOT_DIR (#94)
+  - fragments: fix an edge case involving path-only fragments and PKG_CONFIG_SYSROOT_DIR (github #94)
 
 Changes from 0.9.12 to 1.0.0:
 -----------------------------

README.md

@@ -1,11 +1,11 @@
-# pkgconf [![Build Status](https://travis-ci.org/pkgconf/pkgconf.svg?branch=master)](https://travis-ci.org/pkgconf/pkgconf) [![Documentation Status](https://readthedocs.org/projects/pkgconf/badge/?version=latest)](http://pkgconf.readthedocs.io/en/latest/?badge=latest)
+# 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 frameworks.  It is similar to pkg-config from freedesktop.org.
+development libraries.  It is similar to pkg-config from freedesktop.org.
 
-`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 frameworks configured by
-pkgconf.
+`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.
 
 ## using `pkgconf` with autotools
 
@@ -41,7 +41,7 @@ to improve this behaviour.
 As of the 1.1 series, pkgconf also fully implements support for `Provides` rules,
 while pkg-config does not.  pkg-config only provides the `--print-provides` functionality
 as a stub.  There are other intentional implementation differences in pkgconf's dependency
-resolver verses pkg-config's dependency resolver in terms of completeness and correctness,
+resolver versus pkg-config's dependency resolver in terms of completeness and correctness,
 such as, for example, how `Conflicts` rules are processed.
 
 ## linker flags optimization
@@ -50,7 +50,7 @@ As previously mentioned, pkgconf makes optimizations to the linker flags in both
 case of static and shared linking in order to avoid overlinking binaries and also
 simplifies the `CFLAGS` and `LIBS` output of the pkgconf tool for improved readability.
 
-This functionality depends on the pkg-config module properly declaring it's dependency
+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.
 
@@ -60,6 +60,10 @@ Doing so is discouraged by the [freedesktop tutorial][fd-tut] anyway.
 
 ## compatibility with pkg-config
 
+I really hate that I have to have this section, I like being a nice person, but we
+unfortunately have to say this because otherwise we get passive-aggressive people who
+try to argue with us about what pkg-config compatibility means.
+
 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,
@@ -67,7 +71,27 @@ do let us know, but also make sure that the .pc files are valid and follow the r
 the [pkg-config tutorial][fd-tut], as most likely fixing them to follow the specified
 rules will solve the problem.
 
-## compiling `pkgconf` and `libpkgconf`
+Additionally, **we do not consider pkgconf doing what you tell it to do, in cases for 
+which pkg-config fails to do so, to be a bug**.
+
+If, for example, you use environment variables such as `PKG_CONFIG_SYSTEM_[INCLUDE|LIBRARY]_PATH`
+and then find yourself surprised that `pkgconf` is stripping `-I` and `-L` flags relating
+to those paths, it is not a `pkgconf` problem -- `pkgconf` is doing exactly what you told
+it to do.
+
+We will reject bugs like this, and if someone insists on fixing such a non-bug, this 
+constitutes a violation of our [Code of Conduct](CODE_OF_CONDUCT.md), which may be 
+addressed by banning from this repository.
+
+## 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:
@@ -88,21 +112,38 @@ flags like so:
     $ 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 /usr/bin/pkgconf /usr/bin/pkg-config
+    $ ln -sf pkgconf /usr/bin/pkg-config
 
 ## release tarballs
 
-Release tarballs are available at <https://distfiles.dereferenced.org/pkgconf/>.
+Release tarballs are available at <https://distfiles.ariadne.space/pkgconf/>.
+Please only use the tarballs from distfiles.ariadne.space.
 
-Please do not use the github tarballs as they are not pristine (instead generated by github everytime
-a download occurs).
+## contacts
 
-## reporting bugs
+You can report bugs at <https://github.com/pkgconf/pkgconf/issues>.
 
-See <https://github.com/pkgconf/pkgconf/issues>.
+There is a mailing list at <https://lists.sr.ht/~kaniini/pkgconf>.
 
-Also you can contact us at `#pkgconf` at `irc.freenode.net`.
+You can contact us via IRC at `#pkgconf` at `irc.oftc.net`.

cli/bomtool/main.c

@@ -0,0 +1,365 @@
+/*
+ * bomtool/main.c
+ * main() routine, printer functions
+ *
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ *     pkgconf authors (see AUTHORS).
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+#include "libpkgconf/config.h"
+#include <libpkgconf/stdinc.h>
+#include <libpkgconf/libpkgconf.h>
+#include "getopt_long.h"
+
+#define PKG_VERSION			(((uint64_t) 1) << 1)
+#define PKG_ABOUT			(((uint64_t) 1) << 2)
+#define PKG_HELP			(((uint64_t) 1) << 3)
+
+static const char *spdx_version = "SPDX-2.2";
+static const char *bom_license = "CC0-1.0";
+static const char *document_ref = "SPDXRef-DOCUMENT";
+
+static pkgconf_client_t pkg_client;
+static uint64_t want_flags;
+static size_t maximum_package_count = 0;
+static int maximum_traverse_depth = 2000;
+FILE *error_msgout = NULL;
+
+static bool
+error_handler(const char *msg, const pkgconf_client_t *client, void *data)
+{
+	(void) client;
+	(void) data;
+	fprintf(error_msgout, "%s", msg);
+	return true;
+}
+
+static const char *
+sbom_spdx_identity(pkgconf_pkg_t *pkg)
+{
+	static char buf[PKGCONF_ITEM_SIZE];
+
+	snprintf(buf, sizeof buf, "%sC64%s", pkg->id, pkg->version);
+
+	return buf;
+}
+
+static const char *
+sbom_name(pkgconf_pkg_t *world)
+{
+	static char buf[PKGCONF_BUFSIZE];
+	pkgconf_node_t *node;
+
+	pkgconf_strlcpy(buf, "SBOM-SPDX", sizeof buf);
+
+	PKGCONF_FOREACH_LIST_ENTRY(world->required.head, node)
+	{
+		pkgconf_dependency_t *dep = node->data;
+		pkgconf_pkg_t *match = dep->match;
+
+		if (!dep->match)
+			continue;
+
+		pkgconf_strlcat(buf, "-", sizeof buf);
+		pkgconf_strlcat(buf, sbom_spdx_identity(match), sizeof buf);
+	}
+
+	return buf;
+}
+
+static void
+write_sbom_header(pkgconf_client_t *client, pkgconf_pkg_t *world)
+{
+	(void) client;
+	(void) world;
+
+	printf("SPDXVersion: %s\n", spdx_version);
+	printf("DataLicense: %s\n", bom_license);
+	printf("SPDXID: %s\n", document_ref);
+	printf("DocumentName: %s\n", sbom_name(world));
+	printf("DocumentNamespace: https://spdx.org/spdxdocs/bomtool-%s\n", PACKAGE_VERSION);
+	printf("Creator: Tool: bomtool %s\n", PACKAGE_VERSION);
+
+	printf("\n\n");
+}
+
+static const char *
+sbom_identity(pkgconf_pkg_t *pkg)
+{
+	static char buf[PKGCONF_ITEM_SIZE];
+
+	snprintf(buf, sizeof buf, "%s@%s", pkg->id, pkg->version);
+
+	return buf;
+}
+
+static void
+write_sbom_package(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *unused)
+{
+	(void) client;
+	(void) unused;
+
+	if (pkg->flags & PKGCONF_PKG_PROPF_VIRTUAL)
+		return;
+
+	printf("##### Package: %s\n\n", sbom_identity(pkg));
+
+	printf("PackageName: %s\n", sbom_identity(pkg));
+	printf("SPDXID: SPDXRef-Package-%s\n", sbom_spdx_identity(pkg));
+	printf("PackageVersion: %s\n", pkg->version);
+	printf("PackageDownloadLocation: NOASSERTION\n");
+	printf("PackageVerificationCode: NOASSERTION\n");
+
+	/* XXX: What about projects? */
+	if (pkg->maintainer != NULL)
+		printf("PackageSupplier: Person: %s\n", pkg->maintainer);
+
+	if (pkg->url != NULL)
+		printf("PackageHomePage: %s\n", pkg->url);
+
+	printf("PackageLicenseDeclared: %s\n", pkg->license != NULL ? pkg->license : "NOASSERTION");
+
+	if (pkg->copyright != NULL)
+		printf("PackageCopyrightText: <text>%s</text>\n", pkg->copyright);
+
+	if (pkg->description != NULL)
+		printf("PackageSummary: <text>%s</text>\n", pkg->description);
+
+	printf("\n\n");
+}
+
+static void
+write_sbom_relationships(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *unused)
+{
+	(void) client;
+	(void) unused;
+
+	char baseref[PKGCONF_ITEM_SIZE];
+	pkgconf_node_t *node;
+
+	if (pkg->flags & PKGCONF_PKG_PROPF_VIRTUAL)
+		return;
+
+	snprintf(baseref, sizeof baseref, "SPDXRef-Package-%sC64%s", pkg->id, pkg->version);
+
+	PKGCONF_FOREACH_LIST_ENTRY(pkg->required.head, node)
+	{
+		pkgconf_dependency_t *dep = node->data;
+		pkgconf_pkg_t *match = dep->match;
+
+		if (!dep->match)
+			continue;
+
+		printf("Relationship: %s DEPENDS_ON SPDXRef-Package-%s\n", baseref, sbom_spdx_identity(match));
+		printf("Relationship: SPDXRef-Package-%s DEPENDENCY_OF %s\n", sbom_spdx_identity(match), baseref);
+	}
+
+	PKGCONF_FOREACH_LIST_ENTRY(pkg->requires_private.head, node)
+	{
+		pkgconf_dependency_t *dep = node->data;
+		pkgconf_pkg_t *match = dep->match;
+
+		if (!dep->match)
+			continue;
+
+		printf("Relationship: %s DEPENDS_ON SPDXRef-Package-%s\n", baseref, sbom_spdx_identity(match));
+		printf("Relationship: SPDXRef-Package-%s DEV_DEPENDENCY_OF %s\n", sbom_spdx_identity(match), baseref);
+	}
+
+	if (pkg->required.head != NULL || pkg->requires_private.head != NULL)
+		printf("\n\n");
+}
+
+static bool
+generate_sbom_from_world(pkgconf_client_t *client, pkgconf_pkg_t *world)
+{
+	int eflag;
+	pkgconf_node_t *node;
+
+	write_sbom_header(client, world);
+
+	eflag = pkgconf_pkg_traverse(client, world, write_sbom_package, NULL, maximum_traverse_depth, 0);
+	if (eflag != PKGCONF_PKG_ERRF_OK)
+		return false;
+
+	eflag = pkgconf_pkg_traverse(client, world, write_sbom_relationships, NULL, maximum_traverse_depth, 0);
+	if (eflag != PKGCONF_PKG_ERRF_OK)
+		return false;
+
+	PKGCONF_FOREACH_LIST_ENTRY(world->required.head, node)
+	{
+		pkgconf_dependency_t *dep = node->data;
+		pkgconf_pkg_t *match = dep->match;
+
+		if (!dep->match)
+			continue;
+
+		printf("Relationship: %s DESCRIBES SPDXRef-Package-%s\n", document_ref, sbom_spdx_identity(match));
+	}
+
+	return true;
+}
+
+static int
+version(void)
+{
+	printf("bomtool %s\n", PACKAGE_VERSION);
+	return EXIT_SUCCESS;
+}
+
+static int
+about(void)
+{
+	printf("bomtool (%s %s)\n", PACKAGE_NAME, PACKAGE_VERSION);
+	printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021\n");
+	printf("    pkgconf authors (see AUTHORS in documentation directory).\n\n");
+	printf("Permission to use, copy, modify, and/or distribute this software for any\n");
+	printf("purpose with or without fee is hereby granted, provided that the above\n");
+	printf("copyright notice and this permission notice appear in all copies.\n\n");
+	printf("This software is provided 'as is' and without any warranty, express or\n");
+	printf("implied.  In no event shall the authors be liable for any damages arising\n");
+	printf("from the use of this software.\n\n");
+	printf("Report bugs at <%s>.\n", PACKAGE_BUGREPORT);
+	return EXIT_SUCCESS;
+}
+
+static int
+usage(void)
+{
+	printf("usage: bomtool [--flags] [modules]\n");
+
+	printf("\nbasic options:\n\n");
+
+	printf("  --help                            this message\n");
+	printf("  --about                           print bomtool version and license to stdout\n");
+	printf("  --version                         print bomtool version to stdout\n");
+
+	return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char *argv[])
+{
+	int ret = EXIT_SUCCESS;
+	pkgconf_list_t pkgq = PKGCONF_LIST_INITIALIZER;
+	unsigned int want_client_flags = PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
+	pkgconf_cross_personality_t *personality = pkgconf_cross_personality_default();
+	pkgconf_pkg_t world = {
+		.id = "virtual:world",
+		.realname = "virtual world package",
+		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
+	};
+
+	error_msgout = stderr;
+
+	struct pkg_option options[] = {
+		{ "version", no_argument, &want_flags, PKG_VERSION, },
+		{ "about", no_argument, &want_flags, PKG_ABOUT, },
+		{ "help", no_argument, &want_flags, PKG_HELP, },
+		{ NULL, 0, NULL, 0 }
+	};
+
+	while ((ret = pkg_getopt_long_only(argc, argv, "", options, NULL)) != -1)
+	{
+		switch (ret)
+		{
+		case '?':
+		case ':':
+			return EXIT_FAILURE;
+		default:
+			break;
+		}
+	}
+
+	pkgconf_client_init(&pkg_client, error_handler, NULL, personality);
+
+	/* we have determined what features we want most likely.  in some cases, we override later. */
+	pkgconf_client_set_flags(&pkg_client, want_client_flags);
+
+	/* at this point, want_client_flags should be set, so build the dir list */
+	pkgconf_client_dir_list_build(&pkg_client, personality);
+
+	if ((want_flags & PKG_ABOUT) == PKG_ABOUT)
+		return about();
+
+	if ((want_flags & PKG_VERSION) == PKG_VERSION)
+		return version();
+
+	if ((want_flags & PKG_HELP) == PKG_HELP)
+		return usage();
+
+	while (1)
+	{
+		const char *package = argv[pkg_optind];
+
+		if (package == NULL)
+			break;
+
+		/* check if there is a limit to the number of packages allowed to be included, if so and we have hit
+		 * the limit, stop adding packages to the queue.
+		 */
+		if (maximum_package_count > 0 && pkgq.length > maximum_package_count)
+			break;
+
+		while (isspace((unsigned char)package[0]))
+			package++;
+
+		/* skip empty packages */
+		if (package[0] == '\0') {
+			pkg_optind++;
+			continue;
+		}
+
+		if (argv[pkg_optind + 1] == NULL || !PKGCONF_IS_OPERATOR_CHAR(*(argv[pkg_optind + 1])))
+		{
+			pkgconf_queue_push(&pkgq, package);
+			pkg_optind++;
+		}
+		else
+		{
+			char packagebuf[PKGCONF_BUFSIZE];
+
+			snprintf(packagebuf, sizeof packagebuf, "%s %s %s", package, argv[pkg_optind + 1], argv[pkg_optind + 2]);
+			pkg_optind += 3;
+
+			pkgconf_queue_push(&pkgq, packagebuf);
+		}
+	}
+
+	if (pkgq.head == NULL)
+	{
+		fprintf(stderr, "Please specify at least one package name on the command line.\n");
+		ret = EXIT_FAILURE;
+		goto out;
+	}
+
+	ret = EXIT_SUCCESS;
+
+	if (!pkgconf_queue_solve(&pkg_client, &pkgq, &world, maximum_traverse_depth))
+	{
+		ret = EXIT_FAILURE;
+		goto out;
+	}
+
+	if (!generate_sbom_from_world(&pkg_client, &world))
+	{
+		ret = EXIT_FAILURE;
+		goto out;
+	}
+
+out:
+	pkgconf_solution_free(&pkg_client, &world);
+	pkgconf_queue_free(&pkgq);
+	pkgconf_cross_personality_deinit(personality);
+	pkgconf_client_deinit(&pkg_client);
+
+	return ret;
+}

cli/getopt_long.c

@@ -62,7 +62,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES
 
@@ -83,7 +85,8 @@ char    *pkg_optarg;		/* argument associated with option */
 #define	BADARG		((*options == ':') ? (int)':' : (int)'?')
 #define	INORDER 	(int)1
 
-#define	EMSG		""
+/* add some padding to EMSG to avoid overrun */
+#define	EMSG		"\0\0\0\0"
 
 #ifdef GNU_COMPATIBLE
 #define NO_PREFIX	(-1)
@@ -284,7 +287,7 @@ parse_long_options(char * const *nargv, const char *options,
 			 * XXX: GNU sets pkg_optopt to val regardless of flag
 			 */
 			if (long_options[match].flag == NULL)
-				pkg_optopt = long_options[match].val;
+				pkg_optopt = (int)long_options[match].val;
 			else
 				pkg_optopt = 0;
 #ifdef GNU_COMPATIBLE
@@ -324,7 +327,7 @@ parse_long_options(char * const *nargv, const char *options,
 			 * XXX: GNU sets pkg_optopt to val regardless of flag
 			 */
 			if (long_options[match].flag == NULL)
-				pkg_optopt = long_options[match].val;
+				pkg_optopt = (int)long_options[match].val;
 			else
 				pkg_optopt = 0;
 			--pkg_optind;
@@ -357,7 +360,7 @@ parse_long_options(char * const *nargv, const char *options,
 #endif
 		return (0);
 	} else
-		return (long_options[match].val);
+		return ((int)long_options[match].val);
 }
 
 /*

cli/renderer-msvc.c

@@ -0,0 +1,172 @@
+/*
+ * renderer-msvc.c
+ * MSVC library syntax renderer
+ *
+ * Copyright (c) 2017 pkgconf authors (see AUTHORS).
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <libpkgconf/libpkgconf.h>
+#include "renderer-msvc.h"
+
+static inline bool
+fragment_should_quote(const pkgconf_fragment_t *frag)
+{
+	const char *src;
+
+	if (frag->data == NULL)
+		return false;
+
+	for (src = frag->data; *src; src++)
+	{
+		if (((*src < ' ') ||
+		    (*src >= (' ' + (frag->merged ? 1 : 0)) && *src < '$') ||
+		    (*src > '$' && *src < '(') ||
+		    (*src > ')' && *src < '+') ||
+		    (*src > ':' && *src < '=') ||
+		    (*src > '=' && *src < '@') ||
+		    (*src > 'Z' && *src < '^') ||
+		    (*src == '`') ||
+		    (*src > 'z' && *src < '~') ||
+		    (*src > '~')))
+			return true;
+	}
+
+	return false;
+}
+
+static inline size_t
+fragment_len(const pkgconf_fragment_t *frag)
+{
+	size_t len = 1;
+
+	if (frag->type)
+		len += 2;
+
+	if (frag->data != NULL)
+	{
+		len += strlen(frag->data);
+
+		if (fragment_should_quote(frag))
+			len += 2;
+	}
+
+	return len;
+}
+
+static inline bool
+allowed_fragment(const pkgconf_fragment_t *frag)
+{
+	return !(!frag->type || frag->data == NULL || strchr("DILl", frag->type) == NULL);
+}
+
+static size_t
+msvc_renderer_render_len(const pkgconf_list_t *list, bool escape)
+{
+	(void) escape;
+
+	size_t out = 1;		/* trailing nul */
+	pkgconf_node_t *node;
+
+	PKGCONF_FOREACH_LIST_ENTRY(list->head, node)
+	{
+		const pkgconf_fragment_t *frag = node->data;
+
+		if (!allowed_fragment(frag))
+			continue;
+
+		switch (frag->type)
+		{
+			case 'L':
+				out += 9; /* "/libpath:" */
+				break;
+			case 'l':
+				out += 4; /* ".lib" */
+				break;
+			default:
+				break;
+		}
+
+		out += fragment_len(frag);
+	}
+
+	return out;
+}
+
+static void
+msvc_renderer_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool escape)
+{
+	pkgconf_node_t *node;
+	char *bptr = buf;
+
+	memset(buf, 0, buflen);
+
+	PKGCONF_FOREACH_LIST_ENTRY(list->head, node)
+	{
+		const pkgconf_fragment_t *frag = node->data;
+		size_t buf_remaining = buflen - (bptr - buf);
+		size_t cnt;
+
+		if (!allowed_fragment(frag))
+			continue;
+
+		if (fragment_len(frag) > buf_remaining)
+			break;
+
+		switch(frag->type) {
+		case 'D':
+		case 'I':
+			*bptr++ = '/';
+			*bptr++ = frag->type;
+			break;
+		case 'L':
+			cnt = pkgconf_strlcpy(bptr, "/libpath:", buf_remaining);
+			bptr += cnt;
+			buf_remaining -= cnt;
+			break;
+		}
+
+		escape = fragment_should_quote(frag);
+
+		if (escape)
+			*bptr++ = '"';
+
+		cnt = pkgconf_strlcpy(bptr, frag->data, buf_remaining);
+		bptr += cnt;
+		buf_remaining -= cnt;
+
+		if (frag->type == 'l')
+		{
+			cnt = pkgconf_strlcpy(bptr, ".lib", buf_remaining);
+			bptr += cnt;
+		}
+
+		if (escape)
+			*bptr++ = '"';
+
+		*bptr++ = ' ';
+	}
+
+	*bptr = '\0';
+}
+
+static const pkgconf_fragment_render_ops_t msvc_renderer_ops = {
+	.render_len = msvc_renderer_render_len,
+	.render_buf = msvc_renderer_render_buf
+};
+
+const pkgconf_fragment_render_ops_t *
+msvc_renderer_get(void)
+{
+	return &msvc_renderer_ops;
+}

cli/renderer-msvc.h

@@ -0,0 +1,23 @@
+/*
+ * renderer-msvc.h
+ * MSVC library syntax renderer header
+ *
+ * Copyright (c) 2017 pkgconf authors (see AUTHORS).
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+#ifndef RENDERER_MSVC_H
+#define RENDERER_MSVC_H
+
+#include <libpkgconf/libpkgconf.h>
+
+const pkgconf_fragment_render_ops_t *msvc_renderer_get(void);
+
+#endif

configure.ac

@@ -11,31 +11,46 @@ dnl This software is provided 'as is' and without any warranty, express or
 dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.
 
-AC_PREREQ([2.68])
-AC_INIT([pkgconf], [1.1.0], [http://github.com/pkgconf/pkgconf/issues])
-AC_CONFIG_SRCDIR([main.c])
+AC_PREREQ([2.71])
+AC_INIT([pkgconf],[2.2.0],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_CONFIG_SRCDIR([cli/main.c])
+AC_CONFIG_MACRO_DIR([m4])
+AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
+AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
+AX_CHECK_COMPILE_FLAG([-Wformat=2], [CFLAGS="$CFLAGS -Wformat=2"])
+AX_CHECK_COMPILE_FLAG([-std=gnu99], [CFLAGS="$CFLAGS -std=gnu99"], [
+	AX_CHECK_COMPILE_FLAG([-std=c99], [CFLAGS="$CFLAGS -std=c99"])
+])
 AC_CONFIG_HEADERS([libpkgconf/config.h])
-AC_CHECK_FUNCS([strlcpy strlcat strndup])
+AC_CHECK_DECLS([strlcpy, strlcat, strndup], [], [], [[#include <string.h>]])
+AC_CHECK_DECLS([reallocarray])
 AC_CHECK_HEADERS([sys/stat.h])
-AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
 AM_SILENT_RULES([yes])
 LT_INIT
 
 AC_SYS_LARGEFILE
 
-AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
-	     the place where pc files will be found])],PKGCONFIGDIR="$withval",
-	     PKGCONFIGDIR="${libdir}/pkgconfig:${datadir}/pkgconfig")
+AC_ARG_WITH([personality-dir],[AS_HELP_STRING([--with-personality-dir],[specify
+	     the place where cross-compile personality files will be found])],
+	     PERSONALITY_PATH="$withval",
+	     PERSONALITY_PATH="${datadir}/pkgconfig/personality.d:${sysconfdir}/pkgconfig/personality.d")
 
-AC_SUBST([PKGCONFIGDIR])
+AC_SUBST([PERSONALITY_PATH])
 
-AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the
+AC_ARG_WITH([pkg-config-dir],[AS_HELP_STRING([--with-pkg-config-dir],[specify
+	     the place where pc files will be found])],PKG_DEFAULT_PATH="$withval",
+	     PKG_DEFAULT_PATH="${libdir}/pkgconfig:${datadir}/pkgconfig")
+
+AC_SUBST([PKG_DEFAULT_PATH])
+
+AC_ARG_WITH([system-libdir],[AS_HELP_STRING([--with-system-libdir],[specify the
 	     system library directory (default LIBDIR)])],
 	     SYSTEM_LIBDIR="$withval", SYSTEM_LIBDIR="${libdir}")
 
 AC_SUBST([SYSTEM_LIBDIR])
 
-AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[specify the
+AC_ARG_WITH([system-includedir],[AS_HELP_STRING([--with-system-includedir],[specify the
 	     system include directory (default INCLUDEDIR)])],
 	     SYSTEM_INCLUDEDIR="$withval", SYSTEM_INCLUDEDIR="${includedir}")
 

doc/extract.py

@@ -70,21 +70,21 @@ def extract_comments(filename):
             while True:
                 char = source_file.read(1)
                 if not char:
-                    if state is 3 or state is 4:
+                    if state == 3 or state == 4:
                         raise UnterminatedCommentError()
-                    if state is 2:
+                    if state == 2:
                         # Was in single line comment. Create comment.
                         comment = Comment(current_comment, line_counter, False)
                         comments.append(comment)
                     return comments
-                if state is 0:
+                if state == 0:
                     # Waiting for comment start character or beginning of
                     # string.
                     if char == '/':
                         state = 1
                     elif char == '"':
                         state = 5
-                elif state is 1:
+                elif state == 1:
                     # Found comment start character, classify next character and
                     # determine if single or multiline comment.
                     if char == '/':
@@ -94,7 +94,7 @@ def extract_comments(filename):
                         state = 3
                     else:
                         state = 0
-                elif state is 2:
+                elif state == 2:
                     # In single line comment, read characters until EOL.
                     if char == '\n':
                         comment = Comment(current_comment, line_counter, False)
@@ -103,14 +103,14 @@ def extract_comments(filename):
                         state = 0
                     else:
                         current_comment += char
-                elif state is 3:
+                elif state == 3:
                     # In multi-line comment, add characters until '*'
                     # encountered.
                     if char == '*':
                         state = 4
                     else:
                         current_comment += char
-                elif state is 4:
+                elif state == 4:
                     # In multi-line comment with asterisk found. Determine if
                     # comment is ending.
                     if char == '/':
@@ -125,13 +125,13 @@ def extract_comments(filename):
                         if char != '*':
                             current_comment += char
                             state = 3
-                elif state is 5:
+                elif state == 5:
                     # In string literal, expect literal end or escape char.
                     if char == '"':
                         state = 0
                     elif char == '\\':
                         state = 6
-                elif state is 6:
+                elif state == 6:
                     # In string literal, escaping current char.
                     state = 5
                 if char == '\n':

doc/libpkgconf-client.rst

@@ -9,21 +9,32 @@ in parallel.
 Client objects are not thread safe, in other words, a client object should not be shared across
 thread boundaries.
 
-.. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler)
+.. c:function:: void pkgconf_client_dir_list_build(pkgconf_client_t *client)
+
+   Bootstraps the package search paths.  If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client,
+   then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the
+   ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used.
+
+   :param pkgconf_client_t* client: The pkgconf client object to bootstrap.
+   :return: nothing
+
+.. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
 
    Initialise a pkgconf client object.
 
    :param pkgconf_client_t* client: The client to initialise.
    :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
    :param void* error_handler_data: user data passed to optional error handler
+   :param pkgconf_cross_personality_t* personality: the cross-compile personality to use for defaults
    :return: nothing
 
-.. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler)
+.. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
 
    Allocate and initialise a pkgconf client object.
 
    :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
    :param void* error_handler_data: user data passed to optional error handler
+   :param pkgconf_cross_personality_t* personality: cross-compile personality to use
    :return: A pkgconf client object.
    :rtype: pkgconf_client_t*
 
@@ -78,3 +89,124 @@ thread boundaries.
    :param pkgconf_client_t* client: The client object being modified.
    :param char* buildroot_dir: The buildroot directory to set or NULL to unset.
    :return: nothing
+
+.. c:function:: bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...)
+
+   Report an error to a client-registered error handler.
+
+   :param pkgconf_client_t* client: The pkgconf client object to report the error to.
+   :param char* format: A printf-style format string to use for formatting the error message.
+   :return: true if the error handler processed the message, else false.
+   :rtype: bool
+
+.. c:function:: bool pkgconf_warn(const pkgconf_client_t *client, const char *format, ...)
+
+   Report an error to a client-registered warn handler.
+
+   :param pkgconf_client_t* client: The pkgconf client object to report the error to.
+   :param char* format: A printf-style format string to use for formatting the warning message.
+   :return: true if the warn handler processed the message, else false.
+   :rtype: bool
+
+.. c:function:: bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t len, const char *funcname, const char *format, ...)
+
+   Report a message to a client-registered trace handler.
+
+   :param pkgconf_client_t* client: The pkgconf client object to report the trace message to.
+   :param char* filename: The file the function is in.
+   :param size_t lineno: The line number currently being executed.
+   :param char* funcname: The function name to use.
+   :param char* format: A printf-style format string to use for formatting the trace message.
+   :return: true if the trace handler processed the message, else false.
+   :rtype: bool
+
+.. c:function:: bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data)
+
+   The default pkgconf error handler.
+
+   :param char* msg: The error message to handle.
+   :param pkgconf_client_t* client: The client object the error originated from.
+   :param void* data: An opaque pointer to extra data associated with the client for error handling.
+   :return: true (the function does nothing to process the message)
+   :rtype: bool
+
+.. c:function:: unsigned int pkgconf_client_get_flags(const pkgconf_client_t *client)
+
+   Retrieves resolver-specific flags associated with a client object.
+
+   :param pkgconf_client_t* client: The client object to retrieve the resolver-specific flags from.
+   :return: a bitfield of resolver-specific flags
+   :rtype: uint
+
+.. c:function:: void pkgconf_client_set_flags(pkgconf_client_t *client, unsigned int flags)
+
+   Sets resolver-specific flags associated with a client object.
+
+   :param pkgconf_client_t* client: The client object to set the resolver-specific flags on.
+   :return: nothing
+
+.. c:function:: const char *pkgconf_client_get_prefix_varname(const pkgconf_client_t *client)
+
+   Retrieves the name of the variable that should contain a module's prefix.
+   In some cases, it is necessary to override this variable to allow proper path relocation.
+
+   :param pkgconf_client_t* client: The client object to retrieve the prefix variable name from.
+   :return: the prefix variable name as a string
+   :rtype: const char *
+
+.. c:function:: void pkgconf_client_set_prefix_varname(pkgconf_client_t *client, const char *prefix_varname)
+
+   Sets the name of the variable that should contain a module's prefix.
+   If the variable name is ``NULL``, then the default variable name (``prefix``) is used.
+
+   :param pkgconf_client_t* client: The client object to set the prefix variable name on.
+   :param char* prefix_varname: The prefix variable name to set.
+   :return: nothing
+
+.. c:function:: pkgconf_client_get_warn_handler(const pkgconf_client_t *client)
+
+   Returns the warning handler if one is set, else ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to get the warn handler from.
+   :return: a function pointer to the warn handler or ``NULL``
+
+.. c:function:: pkgconf_client_set_warn_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t warn_handler, void *warn_handler_data)
+
+   Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to set the warn handler on.
+   :param pkgconf_error_handler_func_t warn_handler: The warn handler to set.
+   :param void* warn_handler_data: Optional data to associate with the warn handler.
+   :return: nothing
+
+.. c:function:: pkgconf_client_get_error_handler(const pkgconf_client_t *client)
+
+   Returns the error handler if one is set, else ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to get the error handler from.
+   :return: a function pointer to the error handler or ``NULL``
+
+.. c:function:: pkgconf_client_set_error_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data)
+
+   Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to set the error handler on.
+   :param pkgconf_error_handler_func_t error_handler: The error handler to set.
+   :param void* error_handler_data: Optional data to associate with the error handler.
+   :return: nothing
+
+.. c:function:: pkgconf_client_get_trace_handler(const pkgconf_client_t *client)
+
+   Returns the error handler if one is set, else ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to get the error handler from.
+   :return: a function pointer to the error handler or ``NULL``
+
+.. c:function:: pkgconf_client_set_trace_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t trace_handler, void *trace_handler_data)
+
+   Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+
+   :param pkgconf_client_t* client: The client object to set the error handler on.
+   :param pkgconf_error_handler_func_t trace_handler: The error handler to set.
+   :param void* trace_handler_data: Optional data to associate with the error handler.
+   :return: nothing

doc/libpkgconf-dependency.rst

@@ -9,10 +9,12 @@ The `dependency` module provides support for building `dependency lists` (the ba
 
    Adds a parsed dependency to a dependency list as a dependency node.
 
+   :param pkgconf_client_t* client: The client object that owns the package this dependency list belongs to.
    :param pkgconf_list_t* list: The dependency list to add a dependency node to.
    :param char* package: The package `atom` to set on the dependency node.
    :param char* version: The package `version` to set on the dependency node.
    :param pkgconf_pkg_comparator_t compare: The comparison operator to set on the dependency node.
+   :param uint flags: Any flags to attach to the dependency node.
    :return: A dependency node.
    :rtype: pkgconf_dependency_t *
 
@@ -24,9 +26,32 @@ The `dependency` module provides support for building `dependency lists` (the ba
    :param pkgconf_dependency_t* tail: The dependency node to add to the tail of the dependency list.
    :return: nothing
 
+.. c:function:: void pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
+
+   Frees a dependency node.
+
+   :param pkgconf_dependency_t* dep: The dependency node to free.
+   :return: nothing
+
+.. c:function:: pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
+
+   Increases a dependency node's refcount.
+
+   :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
+   :param pkgconf_dependency_t* dep: The dependency to increase the refcount of.
+   :return: the dependency node on success, else NULL
+
+.. c:function:: void pkgconf_dependency_unref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
+
+   Decreases a dependency node's refcount and frees it if necessary.
+
+   :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
+   :param pkgconf_dependency_t* dep: The dependency to decrease the refcount of.
+   :return: nothing
+
 .. c:function:: void pkgconf_dependency_free(pkgconf_list_t *list)
 
-   Release a dependency list and it's child dependency nodes.
+   Release a dependency list and its child dependency nodes.
 
    :param pkgconf_list_t* list: The dependency list to release.
    :return: nothing
@@ -37,8 +62,10 @@ The `dependency` module provides support for building `dependency lists` (the ba
    Commas are counted as whitespace to allow for constructs such as ``@SUBSTVAR@, zlib`` being processed
    into ``, zlib``.
 
+   :param pkgconf_client_t* client: The client object that owns the package this dependency list belongs to.
    :param pkgconf_list_t* deplist_head: The dependency list to populate with dependency nodes.
    :param char* depends: The dependency data to parse.
+   :param uint flags: Any flags to attach to the dependency nodes.
    :return: nothing
 
 .. c:function:: void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends)
@@ -51,4 +78,13 @@ The `dependency` module provides support for building `dependency lists` (the ba
    :param pkgconf_pkg_t* pkg: The package object that owns this dependency list.
    :param pkgconf_list_t* deplist: The dependency list to populate with dependency nodes.
    :param char* depends: The dependency data to parse.
+   :param uint flags: Any flags to attach to the dependency nodes.
    :return: nothing
+
+.. c:function:: pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
+
+   Copies a dependency node to a new one.
+
+   :param pkgconf_client_t* client: The client object that will own this dependency.
+   :param pkgconf_dependency_t* dep: The dependency node to copy.
+   :return: a pointer to a new dependency node, else NULL

doc/libpkgconf-fragment.rst

@@ -6,13 +6,14 @@ The `fragment` module provides low-level management and rendering of fragment li
 `fragment list` contains various `fragments` of text (such as ``-I /usr/include``) in a matter
 which is composable, mergeable and reorderable.
 
-.. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
+.. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
 
    Adds a `fragment` of text to a `fragment list`, possibly modifying the fragment if a sysroot is set.
 
    :param pkgconf_client_t* client: The pkgconf client being accessed.
    :param pkgconf_list_t* list: The fragment list.
    :param char* string: The string of text to add as a fragment to the fragment list.
+   :param uint flags: Parsing-related flags for the package.
    :return: nothing
 
 .. c:function:: bool pkgconf_fragment_has_system_dir(const pkgconf_client_t *client, const pkgconf_fragment_t *frag)
@@ -25,18 +26,28 @@ which is composable, mergeable and reorderable.
    :return: true if the fragment contains a system path, else false
    :rtype: bool
 
-.. c:function:: void pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsigned int flags, bool is_private)
+.. c:function:: void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private)
 
    Copies a `fragment` to another `fragment list`, possibly removing a previous copy of the `fragment`
    in a process known as `mergeback`.
 
+   :param pkgconf_client_t* client: The pkgconf client being accessed.
    :param pkgconf_list_t* list: The list the fragment is being added to.
    :param pkgconf_fragment_t* base: The fragment being copied.
-   :param uint flags: A set of dependency resolver flags.
    :param bool is_private: Whether the fragment list is a `private` fragment list (static linking).
    :return: nothing
 
-.. c:function:: void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, unsigned int flags)
+.. c:function:: void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base)
+
+   Copies a `fragment list` to another `fragment list`, possibly removing a previous copy of the fragments
+   in a process known as `mergeback`.
+
+   :param pkgconf_client_t* client: The pkgconf client being accessed.
+   :param pkgconf_list_t* list: The list the fragments are being added to.
+   :param pkgconf_list_t* base: The list the fragments are being copied from.
+   :return: nothing
+
+.. c:function:: void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func)
 
    Copies a `fragment list` to another `fragment list` which match a user-specified filtering function.
 
@@ -44,24 +55,28 @@ which is composable, mergeable and reorderable.
    :param pkgconf_list_t* dest: The destination list.
    :param pkgconf_list_t* src: The source list.
    :param pkgconf_fragment_filter_func_t filter_func: The filter function to use.
-   :param uint flags: A set of dependency resolver flags.
+   :param void* data: Optional data to pass to the filter function.
    :return: nothing
 
-.. c:function:: size_t pkgconf_fragment_render_len(const pkgconf_list_t *list)
+.. c:function:: size_t pkgconf_fragment_render_len(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops)
 
    Calculates the required memory to store a `fragment list` when rendered as a string.
 
    :param pkgconf_list_t* list: The `fragment list` being rendered.
+   :param bool escape: Whether or not to escape special shell characters (deprecated).
+   :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
    :return: the amount of bytes required to represent the `fragment list` when rendered
    :rtype: size_t
 
-.. c:function:: void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen)
+.. c:function:: void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool escape, const pkgconf_fragment_render_ops_t *ops)
 
    Renders a `fragment list` into a buffer.
 
    :param pkgconf_list_t* list: The `fragment list` being rendered.
    :param char* buf: The buffer to render the fragment list into.
    :param size_t buflen: The length of the buffer.
+   :param bool escape: Whether or not to escape special shell characters (deprecated).
+   :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
    :return: nothing
 
 .. c:function:: char *pkgconf_fragment_render(const pkgconf_list_t *list)
@@ -69,6 +84,8 @@ which is composable, mergeable and reorderable.
    Allocate memory and render a `fragment list` into it.
 
    :param pkgconf_list_t* list: The `fragment list` being rendered.
+   :param bool escape: Whether or not to escape special shell characters (deprecated).
+   :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
    :return: An allocated string containing the rendered `fragment list`.
    :rtype: char *
 
@@ -87,12 +104,13 @@ which is composable, mergeable and reorderable.
    :param pkgconf_list_t* list: The `fragment list` to delete.
    :return: nothing
 
-.. c:function:: void pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
+.. c:function:: bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
 
    Parse a string into a `fragment list`.
 
    :param pkgconf_client_t* client: The pkgconf client being accessed.
    :param pkgconf_list_t* list: The `fragment list` to add the fragment entries to.
    :param pkgconf_list_t* vars: A list of variables to use for variable substitution.
+   :param uint flags: Any parsing flags to be aware of.
    :param char* value: The string to parse into fragments.
-   :return: nothing
+   :return: true on success, false on parse error

doc/libpkgconf-path.rst

@@ -25,12 +25,12 @@ variables.
    :return: number of path nodes added to the path list
    :rtype: size_t
 
-.. c:function:: size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist)
+.. c:function:: size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist)
 
    Adds the paths specified in an environment variable to a path list.  If the environment variable is not set,
    an optional default set of paths is added.
 
-   :param char* environ: The environment variable to look up.
+   :param char* envvarname: The environment variable to look up.
    :param char* fallback: The fallback paths to use if the environment variable is not set.
    :param pkgconf_list_t* dirlist: The path list to add the path nodes to.
    :param bool filter: Whether to perform duplicate filtering.
@@ -46,9 +46,26 @@ variables.
    :return: true if the path list has a matching prefix, otherwise false
    :rtype: bool
 
+.. c:function:: void pkgconf_path_copy_list(pkgconf_list_t *dst, const pkgconf_list_t *src)
+
+   Copies a path list to another path list.
+
+   :param pkgconf_list_t* dst: The path list to copy to.
+   :param pkgconf_list_t* src: The path list to copy from.
+   :return: nothing
+
 .. c:function:: void pkgconf_path_free(pkgconf_list_t *dirlist)
 
    Releases any path nodes attached to the given path list.
 
    :param pkgconf_list_t* dirlist: The path list to clean up.
    :return: nothing
+
+.. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
+
+   Relocates a path, possibly calling normpath() on it.
+
+   :param char* buf: The path to relocate.
+   :param size_t buflen: The buffer length the path is contained in.
+   :return: true on success, false on error
+   :rtype: bool

doc/libpkgconf-personality.rst

@@ -0,0 +1,27 @@
+
+libpkgconf `personality` module
+=========================
+
+.. c:function:: const pkgconf_cross_personality_t *pkgconf_cross_personality_default(void)
+
+   Returns the default cross-compile personality.
+
+   Not thread safe.
+
+   :rtype: pkgconf_cross_personality_t*
+   :return: the default cross-compile personality
+
+.. c:function:: void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *)
+
+   Decrements the count of default cross personality instances.
+
+   Not thread safe.
+
+   :rtype: void
+
+.. c:function:: pkgconf_cross_personality_t *pkgconf_cross_personality_find(const char *triplet)
+
+   Attempts to find a cross-compile personality given a triplet.
+
+   :rtype: pkgconf_cross_personality_t*
+   :return: the default cross-compile personality

doc/libpkgconf-pkg.rst

@@ -5,23 +5,14 @@ libpkgconf `pkg` module
 The `pkg` module provides dependency resolution services and the overall `.pc` file parsing
 routines.
 
-.. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags)
-
-   Bootstraps the package search paths.  If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is provided,
-   then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the
-   ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used.
-
-   :param pkgconf_client_t* client: The pkgconf client object to bootstrap.
-   :param uint flags: A set of dependency resolver options.
-   :return: nothing
-
-.. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f)
+.. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f, unsigned int flags)
 
    Parse a .pc file into a pkgconf_pkg_t object structure.
 
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param char* filename: The filename of the package file (including full path).
    :param FILE* f: The file object to read from.
+   :param uint flags: The flags to use when parsing.
    :returns: A ``pkgconf_pkg_t`` object which contains the package data.
    :rtype: pkgconf_pkg_t *
 
@@ -62,13 +53,12 @@ routines.
    :return: A package object reference if one is found by the scan function, else ``NULL``.
    :rtype: pkgconf_pkg_t *
 
-.. c:function:: pkgconf_pkg_t *pkgconf_pkg_find(pkgconf_client_t *client, const char *name, unsigned int flags)
+.. c:function:: pkgconf_pkg_t *pkgconf_pkg_find(pkgconf_client_t *client, const char *name)
 
    Search for a package.
 
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param char* name: The name of the package `atom` to use for searching.
-   :param uint flags: A set of flags which define the behaviour of the dependency resolver.
    :return: A package object reference if the package was found, else ``NULL``.
    :rtype: pkgconf_pkg_t *
 
@@ -78,7 +68,7 @@ routines.
 
    :param char* a: The first version to compare in the pair.
    :param char* b: The second version to compare in the pair.
-   :return: -1 if the first version is greater, 0 if both versions are equal, 1 if the second version is greater.
+   :return: -1 if the first version is less than, 0 if both versions are equal, 1 if the second version is less than.
    :rtype: int
 
 .. c:function:: pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name)
@@ -106,19 +96,18 @@ routines.
    :return: The comparator bytecode if found, else ``PKGCONF_CMP_ANY``.
    :rtype: pkgconf_pkg_comparator_t
 
-.. c:function:: pkgconf_pkg_t *pkgconf_pkg_verify_dependency(pkgconf_client_t *client, pkgconf_dependency_t *pkgdep, unsigned int flags, unsigned int *eflags)
+.. c:function:: pkgconf_pkg_t *pkgconf_pkg_verify_dependency(pkgconf_client_t *client, pkgconf_dependency_t *pkgdep, unsigned int *eflags)
 
    Verify a pkgconf_dependency_t node in the depgraph.  If the dependency is solvable,
    return the appropriate ``pkgconf_pkg_t`` object, else ``NULL``.
 
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param pkgconf_dependency_t* pkgdep: The dependency graph node to solve.
-   :param uint flags: A set of package resolver flags which modify behaviour.
    :param uint* eflags: An optional pointer that, if set, will be populated with an error code from the resolver.
    :return: On success, the appropriate ``pkgconf_pkg_t`` object to solve the dependency, else ``NULL``.
    :rtype: pkgconf_pkg_t *
 
-.. c:function:: unsigned int pkgconf_pkg_verify_graph(pkgconf_client_t *client, pkgconf_pkg_t *root, int depth, unsigned int flags)
+.. c:function:: unsigned int pkgconf_pkg_verify_graph(pkgconf_client_t *client, pkgconf_pkg_t *root, int depth)
 
    Verify the graph dependency nodes are satisfiable by walking the tree using
    ``pkgconf_pkg_traverse()``.
@@ -126,11 +115,10 @@ routines.
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param pkgconf_pkg_t* root: The root entry in the package dependency graph which should contain the top-level dependencies to resolve.
    :param int depth: The maximum allowed depth for dependency resolution.
-   :param uint flags: A set of package resolver flags which modify it's behaviour.
    :return: On success, ``PKGCONF_PKG_ERRF_OK`` (0), else an error code.
    :rtype: unsigned int
 
-.. c:function:: unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth, unsigned int flags)
+.. c:function:: unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth, unsigned int skip_flags)
 
    Walk and resolve the dependency graph up to `maxdepth` levels.
 
@@ -139,17 +127,11 @@ routines.
    :param pkgconf_pkg_traverse_func_t func: A traversal function to call for each resolved node in the dependency graph.
    :param void* data: An opaque pointer to data to be passed to the traversal function.
    :param int maxdepth: The maximum depth to walk the dependency graph for.  -1 means infinite recursion.
-   :param uint flags: A set of flags which modify the dependency resolver's behaviour:
-
-       :``PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL``: Do not call the traversal function for the root element in the graph if it is a virtual or built-in package.
-       :``PKGCONF_PKG_PKGF_SKIP_CONFLICTS``: Do not process `conflicts` rules.
-       :``PKGCONF_PKG_PKGF_SKIP_PROVIDES``: Do not process `provides` rules.
-       :``PKGCONF_PKG_PKGF_SEARCH_PRIVATE``: Process `requires.private` rules.
-
+   :param uint skip_flags: Skip over dependency nodes containing the specified flags.  A setting of 0 skips no dependency nodes.
    :return: ``PKGCONF_PKG_ERRF_OK`` on success, else an error code.
    :rtype: unsigned int
 
-.. c:function:: int pkgconf_pkg_cflags(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth, unsigned int flags)
+.. c:function:: int pkgconf_pkg_cflags(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth)
 
    Walks a dependency graph and extracts relevant ``CFLAGS`` fragments.
 
@@ -157,14 +139,10 @@ routines.
    :param pkgconf_pkg_t* root: The root of the dependency graph.
    :param pkgconf_list_t* list: The fragment list to add the extracted ``CFLAGS`` fragments to.
    :param int maxdepth: The maximum allowed depth for dependency resolution.  -1 means infinite recursion.
-   :param uint flags: A set of optional dependency resolver flags.  All of the flags for ``pkgconf_pkg_traverse()`` are relevant here, as well as:
-
-       :``PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS``: merge ``CFLAGS.private`` entries as well
-
    :return: ``PKGCONF_PKG_ERRF_OK`` if successful, otherwise an error code.
    :rtype: unsigned int
 
-.. c:function:: int pkgconf_pkg_libs(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth, unsigned int flags)
+.. c:function:: int pkgconf_pkg_libs(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth)
 
    Walks a dependency graph and extracts relevant ``LIBS`` fragments.
 
@@ -172,9 +150,5 @@ routines.
    :param pkgconf_pkg_t* root: The root of the dependency graph.
    :param pkgconf_list_t* list: The fragment list to add the extracted ``LIBS`` fragments to.
    :param int maxdepth: The maximum allowed depth for dependency resolution.  -1 means infinite recursion.
-   :param uint flags: A set of optional dependency resolver flags.  All of the flags for ``pkgconf_pkg_traverse()`` are relevant here, as well as:
-
-       :``PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS``: merge ``LIBS.private`` entries as well
-
    :return: ``PKGCONF_PKG_ERRF_OK`` if successful, otherwise an error code.
    :rtype: unsigned int

doc/libpkgconf-queue.rst

@@ -33,27 +33,46 @@ Using the `queue` module functions is the recommended way of working with depend
    :param pkgconf_list_t* list: The dependency resolution queue to release.
    :return: nothing
 
-.. c:function:: void pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data)
+.. c:function:: void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world, int maxdepth)
+
+   Removes references to package nodes contained in a solution.
+
+   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
+   :param pkgconf_pkg_t* world: The root for the generated dependency graph.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
+   :returns: nothing
+
+.. c:function:: bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
+
+   Solves and flattens the dependency graph for the supplied dependency list.
+
+   :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
+   :param pkgconf_list_t* list: The list of dependency requests to consider.
+   :param pkgconf_pkg_t* world: The root for the generated dependency graph, provided by the caller.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
+   :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
+   :returns: true if the dependency resolver found a solution, otherwise false.
+   :rtype: bool
+
+.. c:function:: void pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
 
    Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem and
    feed the solution to a callback function if a complete dependency graph is found.
 
+   This function should not be used in new code.  Use pkgconf_queue_solve instead.
+
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param pkgconf_list_t* list: The list of dependency requests to consider.
    :param pkgconf_queue_apply_func_t func: The callback function to call if a solution is found by the dependency resolver.
    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
-   :param uint flags: A bitfield of flags that is passed to the dependency resolver, optionally modifying it's behaviour.
    :param void* data: An opaque pointer which is passed to the callback function.
    :returns: true if the dependency resolver found a solution, otherwise false.
    :rtype: bool
 
-.. c:function:: void pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data)
+.. c:function:: void pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
 
    Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem.
 
    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
    :param pkgconf_list_t* list: The list of dependency requests to consider.
    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
-   :param uint flags: A bitfield of flags that is passed to the dependency resolver, optionally modifying it's behaviour.
    :returns: true if the dependency resolver found a solution, otherwise false.
    :rtype: bool

doc/libpkgconf-tuple.rst

@@ -64,13 +64,14 @@ attached to a given client object.
    :return: the value of the variable or ``NULL``
    :rtype: char *
 
-.. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
+.. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
 
    Parse an expression for variable substitution.
 
    :param pkgconf_client_t* client: The pkgconf client object to access.
    :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
    :param char* value: The ``key=value`` string to parse.
+   :param uint flags: Any flags to consider while parsing.
    :return: the variable data with any variables substituted
    :rtype: char *
 

doc/libpkgconf.rst

@@ -11,6 +11,7 @@ libpkgconf - an API for managing `pkg-config` modules
    libpkgconf-dependency
    libpkgconf-fragment
    libpkgconf-path
+   libpkgconf-personality
    libpkgconf-pkg
    libpkgconf-queue
    libpkgconf-tuple

libpkgconf.pc.in

@@ -5,7 +5,8 @@ libdir=@libdir@
 
 Name: libpkgconf
 Description: a library for accessing and manipulating development framework configuration
-URL: http://github.com/pkgconf/pkgconf
+URL: https://gitea.treehouse.systems/ariadne/pkgconf
+License: ISC
 Version: @PACKAGE_VERSION@
 CFlags: -I${includedir}/pkgconf
 Libs: -L${libdir} -lpkgconf

libpkgconf/argvsplit.c

@@ -2,7 +2,7 @@
  * argvsplit.c
  * argv_split() routine
  *
- * Copyright (c) 2012 pkgconf authors (see AUTHORS).
+ * Copyright (c) 2012, 2017 pkgconf authors (see AUTHORS).
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -64,37 +65,45 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 	int argc_count = 0;
 	int argv_size = 5;
 	char quote = 0;
+	bool escaped = false;
 
 	src_iter = src;
 	dst_iter = buf;
 
 	memset(buf, 0, strlen(src) + 1);
 
-	*argv = calloc(sizeof (void *), argv_size);
+	*argv = calloc(argv_size, sizeof (void *));
 	(*argv)[argc_count] = dst_iter;
 
 	while (*src_iter)
 	{
-		if (quote == *src_iter)
-			quote = 0;
+		if (escaped)
+		{
+			/* POSIX: only \CHAR is special inside a double quote if CHAR is {$, `, ", \, newline}. */
+			if (quote == '"')
+			{
+				if (!(*src_iter == '$' || *src_iter == '`' || *src_iter == '"' || *src_iter == '\\'))
+					*dst_iter++ = '\\';
+
+				*dst_iter++ = *src_iter;
+			}
+			else
+			{
+				*dst_iter++ = *src_iter;
+			}
+
+			escaped = false;
+		}
 		else if (quote)
 		{
-			if (*src_iter == '\\')
-			{
-				src_iter++;
-				if (!*src_iter)
-				{
-					free(*argv);
-					free(buf);
-					return -1;
-				}
-
-				if (*src_iter != quote)
-					*dst_iter++ = '\\';
-			}
-			*dst_iter++ = *src_iter;
+			if (*src_iter == quote)
+				quote = 0;
+			else if (*src_iter == '\\' && quote != '\'')
+				escaped = true;
+			else
+				*dst_iter++ = *src_iter;
 		}
-		else if (isspace((unsigned int)*src_iter))
+		else if (isspace((unsigned char)*src_iter))
 		{
 			if ((*argv)[argc_count] != NULL)
 			{
@@ -111,22 +120,15 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 		}
 		else switch(*src_iter)
 		{
-			case '"':
+			case '\\':
+				escaped = true;
+				break;
+
+			case '\"':
 			case '\'':
 				quote = *src_iter;
 				break;
 
-			case '\\':
-				src_iter++;
-
-				if (!*src_iter)
-				{
-					free(argv);
-					free(buf);
-					return -1;
-				} else {
-					*dst_iter++ = '\\';
-				}
 			default:
 				*dst_iter++ = *src_iter;
 				break;
@@ -135,7 +137,15 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
 		src_iter++;
 	}
 
-	if (strlen((*argv)[argc_count])) {
+	if (escaped || quote)
+	{
+		free(*argv);
+		free(buf);
+		return -1;
+	}
+
+	if (strlen((*argv)[argc_count]))
+	{
 		argc_count++;
 	}
 

libpkgconf/bsdstubs.c

@@ -17,13 +17,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
+#include <errno.h>
 
 #include <libpkgconf/bsdstubs.h>
 #include <libpkgconf/config.h>
 
-#ifndef HAVE_STRLCPY
+#if !HAVE_DECL_STRLCPY
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
@@ -56,7 +58,7 @@ strlcpy(char *dst, const char *src, size_t siz)
 }
 #endif
 
-#ifndef HAVE_STRLCAT
+#if !HAVE_DECL_STRLCAT
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters
@@ -105,7 +107,7 @@ strlcat(char *dst, const char *src, size_t siz)
  * from the use of this software.
  */
 
-#ifndef HAVE_STRNDUP
+#if !HAVE_DECL_STRNDUP
 /*
  * Creates a memory buffer and copies at most 'len' characters to it.
  * If 'len' is less than the length of the source string, truncation occured.
@@ -136,3 +138,23 @@ pkgconf_strndup(const char *src, size_t len)
 {
 	return strndup(src, len);
 }
+
+#if !HAVE_DECL_REALLOCARRAY
+void *
+reallocarray(void *ptr, size_t m, size_t n)
+{
+	if (n && m > -1 / n)
+	{
+		errno = ENOMEM;
+		return 0;
+	}
+
+	return realloc(ptr, m * n);
+}
+#endif
+
+void *
+pkgconf_reallocarray(void *ptr, size_t m, size_t n)
+{
+	return reallocarray(ptr, m, n);
+}

libpkgconf/bsdstubs.h

@@ -13,11 +13,22 @@
  * from the use of this software.
  */
 
-#ifndef __BSDSTUBS_H__
-#define __BSDSTUBS_H__
+#ifndef LIBPKGCONF_BSDSTUBS_H
+#define LIBPKGCONF_BSDSTUBS_H
 
-extern size_t pkgconf_strlcpy(char *dst, const char *src, size_t siz);
-extern size_t pkgconf_strlcat(char *dst, const char *src, size_t siz);
-extern char *pkgconf_strndup(const char *src, size_t len);
+#include <libpkgconf/libpkgconf-api.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PKGCONF_API extern size_t pkgconf_strlcpy(char *dst, const char *src, size_t siz);
+PKGCONF_API extern size_t pkgconf_strlcat(char *dst, const char *src, size_t siz);
+PKGCONF_API extern char *pkgconf_strndup(const char *src, size_t len);
+PKGCONF_API extern void *pkgconf_reallocarray(void *ptr, size_t m, size_t n);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif

libpkgconf/cache.c

@@ -13,8 +13,11 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
+#include <assert.h>
+
 /*
  * !doc
  *
@@ -28,6 +31,46 @@
  * be shared across threads.
  */
 
+static int
+cache_member_cmp(const void *a, const void *b)
+{
+	const char *key = a;
+	const pkgconf_pkg_t *pkg = *(void **) b;
+
+	return strcmp(key, pkg->id);
+}
+
+static int
+cache_member_sort_cmp(const void *a, const void *b)
+{
+	const pkgconf_pkg_t *pkgA = *(void **) a;
+	const pkgconf_pkg_t *pkgB = *(void **) b;
+
+	if (pkgA == NULL)
+		return 1;
+
+	if (pkgB == NULL)
+		return -1;
+
+	return strcmp(pkgA->id, pkgB->id);
+}
+
+static void
+cache_dump(const pkgconf_client_t *client)
+{
+	size_t i;
+
+	PKGCONF_TRACE(client, "dumping package cache contents");
+
+	for (i = 0; i < client->cache_count; i++)
+	{
+		const pkgconf_pkg_t *pkg = client->cache_table[i];
+
+		PKGCONF_TRACE(client, SIZE_FMT_SPECIFIER": %p(%s)",
+			i, pkg, pkg == NULL ? "NULL" : pkg->id);
+	}
+}
+
 /*
  * !doc
  *
@@ -43,18 +86,24 @@
  *    :rtype: pkgconf_pkg_t *
  */
 pkgconf_pkg_t *
-pkgconf_cache_lookup(const pkgconf_client_t *client, const char *id)
+pkgconf_cache_lookup(pkgconf_client_t *client, const char *id)
 {
-	pkgconf_node_t *node;
+	if (client->cache_table == NULL)
+		return NULL;
 
-	PKGCONF_FOREACH_LIST_ENTRY(client->pkg_cache.head, node)
+	pkgconf_pkg_t **pkg;
+
+	pkg = bsearch(id, client->cache_table,
+		client->cache_count, sizeof (void *),
+		cache_member_cmp);
+
+	if (pkg != NULL)
 	{
-		pkgconf_pkg_t *pkg = node->data;
-
-		if (!strcmp(pkg->id, id))
-			return pkgconf_pkg_ref(client, pkg);
+		PKGCONF_TRACE(client, "found: %s @%p", id, *pkg);
+		return pkgconf_pkg_ref(client, *pkg);
 	}
 
+	PKGCONF_TRACE(client, "miss: %s", id);
 	return NULL;
 }
 
@@ -77,7 +126,19 @@ pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 		return;
 
 	pkgconf_pkg_ref(client, pkg);
-	pkgconf_node_insert(&pkg->cache_iter, pkg, &client->pkg_cache);
+
+	PKGCONF_TRACE(client, "added @%p to cache", pkg);
+
+	/* mark package as cached */
+	pkg->flags |= PKGCONF_PKG_PROPF_CACHED;
+
+	++client->cache_count;
+	client->cache_table = pkgconf_reallocarray(client->cache_table,
+		client->cache_count, sizeof (void *));
+	client->cache_table[client->cache_count - 1] = pkg;
+
+	qsort(client->cache_table, client->cache_count,
+		sizeof(void *), cache_member_sort_cmp);
 }
 
 /*
@@ -94,10 +155,52 @@ pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 void
 pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 {
+	if (client->cache_table == NULL)
+		return;
+
 	if (pkg == NULL)
 		return;
 
-	pkgconf_node_delete(&pkg->cache_iter, &client->pkg_cache);
+	if (!(pkg->flags & PKGCONF_PKG_PROPF_CACHED))
+		return;
+
+	PKGCONF_TRACE(client, "removed @%p from cache", pkg);
+
+	pkgconf_pkg_t **slot;
+
+	slot = bsearch(pkg->id, client->cache_table,
+		client->cache_count, sizeof (void *),
+		cache_member_cmp);
+
+	if (slot == NULL)
+		return;
+
+	(*slot)->flags &= ~PKGCONF_PKG_PROPF_CACHED;
+	pkgconf_pkg_unref(client, *slot);
+	*slot = NULL;
+
+	qsort(client->cache_table, client->cache_count,
+		sizeof(void *), cache_member_sort_cmp);
+
+	if (client->cache_table[client->cache_count - 1] != NULL)
+	{
+		PKGCONF_TRACE(client, "end of cache table refers to %p, not NULL",
+			client->cache_table[client->cache_count - 1]);
+		cache_dump(client);
+		abort();
+	}
+
+	client->cache_count--;
+	if (client->cache_count > 0)
+	{
+		client->cache_table = pkgconf_reallocarray(client->cache_table,
+			client->cache_count, sizeof(void *));
+	}
+	else
+	{
+		free(client->cache_table);
+		client->cache_table = NULL;
+	}
 }
 
 /*
@@ -114,13 +217,15 @@ pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg)
 void
 pkgconf_cache_free(pkgconf_client_t *client)
 {
-	pkgconf_node_t *iter, *iter2;
+	if (client->cache_table == NULL)
+		return;
 
-	PKGCONF_FOREACH_LIST_ENTRY_SAFE(client->pkg_cache.head, iter2, iter)
-	{
-		pkgconf_pkg_t *pkg = iter->data;
-		pkgconf_pkg_free(client, pkg);
-	}
+	while (client->cache_count > 0)
+		pkgconf_cache_remove(client, client->cache_table[0]);
 
-	memset(&client->pkg_cache, 0, sizeof client->pkg_cache);
+	free(client->cache_table);
+	client->cache_table = NULL;
+	client->cache_count = 0;
+
+	PKGCONF_TRACE(client, "cleared package cache");
 }

libpkgconf/client.c

@@ -13,6 +13,8 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/config.h>
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -29,59 +31,138 @@
  * thread boundaries.
  */
 
+static void
+trace_path_list(const pkgconf_client_t *client, const char *desc, pkgconf_list_t *list)
+{
+	const pkgconf_node_t *n;
+
+	PKGCONF_TRACE(client, "%s:", desc);
+	PKGCONF_FOREACH_LIST_ENTRY(list->head, n)
+	{
+		const pkgconf_path_t *p = n->data;
+
+		PKGCONF_TRACE(client, "  - '%s'", p->path);
+	}
+}
+
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler)
+ * .. c:function:: void pkgconf_client_dir_list_build(pkgconf_client_t *client)
+ *
+ *    Bootstraps the package search paths.  If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client,
+ *    then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the
+ *    ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to bootstrap.
+ *    :return: nothing
+ */
+void
+pkgconf_client_dir_list_build(pkgconf_client_t *client, const pkgconf_cross_personality_t *personality)
+{
+	pkgconf_path_build_from_environ("PKG_CONFIG_PATH", NULL, &client->dir_list, true);
+
+	if (!(client->flags & PKGCONF_PKG_PKGF_ENV_ONLY))
+	{
+		pkgconf_list_t dir_list = PKGCONF_LIST_INITIALIZER;
+		const pkgconf_list_t *prepend_list = &personality->dir_list;
+
+		if (getenv("PKG_CONFIG_LIBDIR") != NULL)
+		{
+			/* PKG_CONFIG_LIBDIR= should empty the search path entirely. */
+			(void) pkgconf_path_build_from_environ("PKG_CONFIG_LIBDIR", NULL, &dir_list, true);
+			prepend_list = &dir_list;
+		}
+
+		pkgconf_path_copy_list(&client->dir_list, prepend_list);
+		pkgconf_path_free(&dir_list);
+	}
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
  *
  *    Initialise a pkgconf client object.
  *
  *    :param pkgconf_client_t* client: The client to initialise.
  *    :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
  *    :param void* error_handler_data: user data passed to optional error handler
+ *    :param pkgconf_cross_personality_t* personality: the cross-compile personality to use for defaults
  *    :return: nothing
  */
 void
-pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data)
+pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
 {
 	client->error_handler_data = error_handler_data;
 	client->error_handler = error_handler;
 	client->auditf = NULL;
+	client->cache_table = NULL;
+	client->cache_count = 0;
 
-	pkgconf_client_set_sysroot_dir(client, NULL);
+#ifndef PKGCONF_LITE
+	if (client->trace_handler == NULL)
+		pkgconf_client_set_trace_handler(client, NULL, NULL);
+#endif
+
+	pkgconf_client_set_error_handler(client, error_handler, error_handler_data);
+	pkgconf_client_set_warn_handler(client, NULL, NULL);
+
+	pkgconf_client_set_sysroot_dir(client, personality->sysroot_dir);
 	pkgconf_client_set_buildroot_dir(client, NULL);
+	pkgconf_client_set_prefix_varname(client, NULL);
 
-	if (client->error_handler == NULL)
-		client->error_handler = pkgconf_default_error_handler;
+	if(getenv("PKG_CONFIG_SYSTEM_LIBRARY_PATH") == NULL)
+		pkgconf_path_copy_list(&client->filter_libdirs, &personality->filter_libdirs);
+	else
+		pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", NULL, &client->filter_libdirs, false);
 
-	pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", SYSTEM_LIBDIR, &client->filter_libdirs, false);
-	pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR, &client->filter_includedirs, false);
+	if(getenv("PKG_CONFIG_SYSTEM_INCLUDE_PATH") == NULL)
+		pkgconf_path_copy_list(&client->filter_includedirs, &personality->filter_includedirs);
+	else
+		pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", NULL, &client->filter_includedirs, false);
 
 	/* GCC uses these environment variables to define system include paths, so we should check them. */
+#ifdef __HAIKU__
+	pkgconf_path_build_from_environ("BELIBRARIES", NULL, &client->filter_libdirs, false);
+#else
 	pkgconf_path_build_from_environ("LIBRARY_PATH", NULL, &client->filter_libdirs, false);
+#endif
 	pkgconf_path_build_from_environ("CPATH", NULL, &client->filter_includedirs, false);
 	pkgconf_path_build_from_environ("C_INCLUDE_PATH", NULL, &client->filter_includedirs, false);
 	pkgconf_path_build_from_environ("CPLUS_INCLUDE_PATH", NULL, &client->filter_includedirs, false);
 	pkgconf_path_build_from_environ("OBJC_INCLUDE_PATH", NULL, &client->filter_includedirs, false);
+
+#ifdef _WIN32
+	/* also use the path lists that MSVC uses on windows */
+	pkgconf_path_build_from_environ("INCLUDE", NULL, &client->filter_includedirs, false);
+#endif
+
+	PKGCONF_TRACE(client, "initialized client @%p", client);
+
+	trace_path_list(client, "filtered library paths", &client->filter_libdirs);
+	trace_path_list(client, "filtered include paths", &client->filter_includedirs);
 }
 
 /*
  * !doc
  *
- * .. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler)
+ * .. c:function:: pkgconf_client_t* pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
  *
  *    Allocate and initialise a pkgconf client object.
  *
  *    :param pkgconf_error_handler_func_t error_handler: An optional error handler to use for logging errors.
  *    :param void* error_handler_data: user data passed to optional error handler
+ *    :param pkgconf_cross_personality_t* personality: cross-compile personality to use
  *    :return: A pkgconf client object.
  *    :rtype: pkgconf_client_t*
  */
 pkgconf_client_t *
-pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data)
+pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality)
 {
-	pkgconf_client_t *out = calloc(sizeof(pkgconf_client_t), 1);
-	pkgconf_client_init(out, error_handler, error_handler_data);
+	pkgconf_client_t *out = calloc(1, sizeof(pkgconf_client_t));
+	pkgconf_client_init(out, error_handler, error_handler_data, personality);
 	return out;
 }
 
@@ -98,12 +179,20 @@ pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handl
 void
 pkgconf_client_deinit(pkgconf_client_t *client)
 {
+	PKGCONF_TRACE(client, "deinit @%p", client);
+
+	if (client->prefix_varname != NULL)
+		free(client->prefix_varname);
+
 	if (client->sysroot_dir != NULL)
 		free(client->sysroot_dir);
 
 	if (client->buildroot_dir != NULL)
 		free(client->buildroot_dir);
 
+	pkgconf_path_free(&client->filter_libdirs);
+	pkgconf_path_free(&client->filter_includedirs);
+
 	pkgconf_tuple_free_global(client);
 	pkgconf_path_free(&client->dir_list);
 	pkgconf_cache_free(client);
@@ -165,6 +254,8 @@ pkgconf_client_set_sysroot_dir(pkgconf_client_t *client, const char *sysroot_dir
 
 	client->sysroot_dir = sysroot_dir != NULL ? strdup(sysroot_dir) : NULL;
 
+	PKGCONF_TRACE(client, "set sysroot_dir to: %s", client->sysroot_dir != NULL ? client->sysroot_dir : "<default>");
+
 	pkgconf_tuple_add_global(client, "pc_sysrootdir", client->sysroot_dir != NULL ? client->sysroot_dir : "/");
 }
 
@@ -207,6 +298,8 @@ pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buildroot
 
 	client->buildroot_dir = buildroot_dir != NULL ? strdup(buildroot_dir) : NULL;
 
+	PKGCONF_TRACE(client, "set buildroot_dir to: %s", client->buildroot_dir != NULL ? client->buildroot_dir : "<default>");
+
 	pkgconf_tuple_add_global(client, "pc_top_builddir", client->buildroot_dir != NULL ? client->buildroot_dir : "$(top_builddir)");
 }
 
@@ -235,6 +328,67 @@ pkgconf_error(const pkgconf_client_t *client, const char *format, ...)
 	return client->error_handler(errbuf, client, client->error_handler_data);
 }
 
+/*
+ * !doc
+ *
+ * .. c:function:: bool pkgconf_warn(const pkgconf_client_t *client, const char *format, ...)
+ *
+ *    Report an error to a client-registered warn handler.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to report the error to.
+ *    :param char* format: A printf-style format string to use for formatting the warning message.
+ *    :return: true if the warn handler processed the message, else false.
+ *    :rtype: bool
+ */
+bool
+pkgconf_warn(const pkgconf_client_t *client, const char *format, ...)
+{
+	char errbuf[PKGCONF_BUFSIZE];
+	va_list va;
+
+	va_start(va, format);
+	vsnprintf(errbuf, sizeof errbuf, format, va);
+	va_end(va);
+
+	return client->warn_handler(errbuf, client, client->warn_handler_data);
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t len, const char *funcname, const char *format, ...)
+ *
+ *    Report a message to a client-registered trace handler.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to report the trace message to.
+ *    :param char* filename: The file the function is in.
+ *    :param size_t lineno: The line number currently being executed.
+ *    :param char* funcname: The function name to use.
+ *    :param char* format: A printf-style format string to use for formatting the trace message.
+ *    :return: true if the trace handler processed the message, else false.
+ *    :rtype: bool
+ */
+bool
+pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t lineno, const char *funcname, const char *format, ...)
+{
+	char errbuf[PKGCONF_BUFSIZE];
+	size_t len;
+	va_list va;
+
+	if (client == NULL || client->trace_handler == NULL)
+		return false;
+
+	len = snprintf(errbuf, sizeof errbuf, "%s:" SIZE_FMT_SPECIFIER " [%s]: ", filename, lineno, funcname);
+
+	va_start(va, format);
+	vsnprintf(errbuf + len, sizeof(errbuf) - len, format, va);
+	va_end(va);
+
+	pkgconf_strlcat(errbuf, "\n", sizeof errbuf);
+
+	return client->trace_handler(errbuf, client, client->trace_handler_data);
+}
+
 /*
  * !doc
  *
@@ -249,7 +403,7 @@ pkgconf_error(const pkgconf_client_t *client, const char *format, ...)
  *    :rtype: bool
  */
 bool
-pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data)
+pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data)
 {
 	(void) msg;
 	(void) client;
@@ -257,3 +411,205 @@ pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, c
 
 	return true;
 }
+
+/*
+ * !doc
+ *
+ * .. c:function:: unsigned int pkgconf_client_get_flags(const pkgconf_client_t *client)
+ *
+ *    Retrieves resolver-specific flags associated with a client object.
+ *
+ *    :param pkgconf_client_t* client: The client object to retrieve the resolver-specific flags from.
+ *    :return: a bitfield of resolver-specific flags
+ *    :rtype: uint
+ */
+unsigned int
+pkgconf_client_get_flags(const pkgconf_client_t *client)
+{
+	return client->flags;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_client_set_flags(pkgconf_client_t *client, unsigned int flags)
+ *
+ *    Sets resolver-specific flags associated with a client object.
+ *
+ *    :param pkgconf_client_t* client: The client object to set the resolver-specific flags on.
+ *    :return: nothing
+ */
+void
+pkgconf_client_set_flags(pkgconf_client_t *client, unsigned int flags)
+{
+	client->flags = flags;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: const char *pkgconf_client_get_prefix_varname(const pkgconf_client_t *client)
+ *
+ *    Retrieves the name of the variable that should contain a module's prefix.
+ *    In some cases, it is necessary to override this variable to allow proper path relocation.
+ *
+ *    :param pkgconf_client_t* client: The client object to retrieve the prefix variable name from.
+ *    :return: the prefix variable name as a string
+ *    :rtype: const char *
+ */
+const char *
+pkgconf_client_get_prefix_varname(const pkgconf_client_t *client)
+{
+	return client->prefix_varname;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_client_set_prefix_varname(pkgconf_client_t *client, const char *prefix_varname)
+ *
+ *    Sets the name of the variable that should contain a module's prefix.
+ *    If the variable name is ``NULL``, then the default variable name (``prefix``) is used.
+ *
+ *    :param pkgconf_client_t* client: The client object to set the prefix variable name on.
+ *    :param char* prefix_varname: The prefix variable name to set.
+ *    :return: nothing
+ */
+void
+pkgconf_client_set_prefix_varname(pkgconf_client_t *client, const char *prefix_varname)
+{
+	if (prefix_varname == NULL)
+		prefix_varname = "prefix";
+
+	if (client->prefix_varname != NULL)
+		free(client->prefix_varname);
+
+	client->prefix_varname = strdup(prefix_varname);
+
+	PKGCONF_TRACE(client, "set prefix_varname to: %s", client->prefix_varname);
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_get_warn_handler(const pkgconf_client_t *client)
+ *
+ *    Returns the warning handler if one is set, else ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to get the warn handler from.
+ *    :return: a function pointer to the warn handler or ``NULL``
+ */
+pkgconf_error_handler_func_t
+pkgconf_client_get_warn_handler(const pkgconf_client_t *client)
+{
+	return client->warn_handler;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_set_warn_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t warn_handler, void *warn_handler_data)
+ *
+ *    Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to set the warn handler on.
+ *    :param pkgconf_error_handler_func_t warn_handler: The warn handler to set.
+ *    :param void* warn_handler_data: Optional data to associate with the warn handler.
+ *    :return: nothing
+ */
+void
+pkgconf_client_set_warn_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t warn_handler, void *warn_handler_data)
+{
+	client->warn_handler = warn_handler;
+	client->warn_handler_data = warn_handler_data;
+
+	if (client->warn_handler == NULL)
+	{
+		PKGCONF_TRACE(client, "installing default warn handler");
+		client->warn_handler = pkgconf_default_error_handler;
+	}
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_get_error_handler(const pkgconf_client_t *client)
+ *
+ *    Returns the error handler if one is set, else ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to get the error handler from.
+ *    :return: a function pointer to the error handler or ``NULL``
+ */
+pkgconf_error_handler_func_t
+pkgconf_client_get_error_handler(const pkgconf_client_t *client)
+{
+	return client->error_handler;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_set_error_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data)
+ *
+ *    Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to set the error handler on.
+ *    :param pkgconf_error_handler_func_t error_handler: The error handler to set.
+ *    :param void* error_handler_data: Optional data to associate with the error handler.
+ *    :return: nothing
+ */
+void
+pkgconf_client_set_error_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data)
+{
+	client->error_handler = error_handler;
+	client->error_handler_data = error_handler_data;
+
+	if (client->error_handler == NULL)
+	{
+		PKGCONF_TRACE(client, "installing default error handler");
+		client->error_handler = pkgconf_default_error_handler;
+	}
+}
+
+#ifndef PKGCONF_LITE
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_get_trace_handler(const pkgconf_client_t *client)
+ *
+ *    Returns the error handler if one is set, else ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to get the error handler from.
+ *    :return: a function pointer to the error handler or ``NULL``
+ */
+pkgconf_error_handler_func_t
+pkgconf_client_get_trace_handler(const pkgconf_client_t *client)
+{
+	return client->trace_handler;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_client_set_trace_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t trace_handler, void *trace_handler_data)
+ *
+ *    Sets a warn handler on a client object or uninstalls one if set to ``NULL``.
+ *
+ *    :param pkgconf_client_t* client: The client object to set the error handler on.
+ *    :param pkgconf_error_handler_func_t trace_handler: The error handler to set.
+ *    :param void* trace_handler_data: Optional data to associate with the error handler.
+ *    :return: nothing
+ */
+void
+pkgconf_client_set_trace_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t trace_handler, void *trace_handler_data)
+{
+	client->trace_handler = trace_handler;
+	client->trace_handler_data = trace_handler_data;
+
+	if (client->trace_handler == NULL)
+	{
+		client->trace_handler = pkgconf_default_error_handler;
+		PKGCONF_TRACE(client, "installing default trace handler");
+	}
+}
+#endif

libpkgconf/config.h.meson

@@ -0,0 +1,68 @@
+/* libpkgconf/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `strlcat' function. */
+#mesondefine HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#mesondefine HAVE_STRLCPY
+
+/* Define to 1 if you have the `strndup' function. */
+#mesondefine HAVE_STRNDUP
+
+/* Define to 1 if you have the `reallocarray' function. */
+#mesondefine HAVE_REALLOCARRAY
+
+/* Define to 1 if you have the `strlcat' function. */
+#mesondefine HAVE_DECL_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#mesondefine HAVE_DECL_STRLCPY
+
+/* Define to 1 if you have the `strndup' function. */
+#mesondefine HAVE_DECL_STRNDUP
+
+/* Define to 1 if you have the `reallocarray' function. */
+#mesondefine HAVE_DECL_REALLOCARRAY
+
+/* Name of package */
+#mesondefine PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#mesondefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#mesondefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#mesondefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#mesondefine PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#mesondefine PACKAGE_URL
+
+/* Define to the version of this package. */
+#mesondefine PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#mesondefine STDC_HEADERS
+
+/* Version number of package */
+#mesondefine VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#mesondefine _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#mesondefine _LARGE_FILES
+
+#mesondefine PKG_DEFAULT_PATH
+#mesondefine SYSTEM_INCLUDEDIR
+#mesondefine SYSTEM_LIBDIR
+#mesondefine PERSONALITY_PATH

libpkgconf/dependency.c

@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -36,22 +37,111 @@ typedef enum {
 
 #define DEBUG_PARSE 0
 
+static const char *
+dependency_to_str(const pkgconf_dependency_t *dep, char *buf, size_t buflen)
+{
+	pkgconf_strlcpy(buf, dep->package, buflen);
+	if (dep->version != NULL)
+	{
+		pkgconf_strlcat(buf, " ", buflen);
+		pkgconf_strlcat(buf, pkgconf_pkg_get_comparator(dep), buflen);
+		pkgconf_strlcat(buf, " ", buflen);
+		pkgconf_strlcat(buf, dep->version, buflen);
+	}
+
+	return buf;
+}
+
+/* find a colliding dependency that is coloured differently */
 static inline pkgconf_dependency_t *
-pkgconf_dependency_addraw(pkgconf_list_t *list, const char *package, size_t package_sz, const char *version, size_t version_sz, pkgconf_pkg_comparator_t compare)
+find_colliding_dependency(const pkgconf_dependency_t *dep, const pkgconf_list_t *list)
+{
+	const pkgconf_node_t *n;
+
+	PKGCONF_FOREACH_LIST_ENTRY(list->head, n)
+	{
+		pkgconf_dependency_t *dep2 = n->data;
+
+		if (strcmp(dep->package, dep2->package))
+			continue;
+
+		if (dep->flags != dep2->flags)
+			return dep2;
+	}
+
+	return NULL;
+}
+
+static inline pkgconf_dependency_t *
+add_or_replace_dependency_node(pkgconf_client_t *client, pkgconf_dependency_t *dep, pkgconf_list_t *list)
+{
+	char depbuf[PKGCONF_ITEM_SIZE];
+	pkgconf_dependency_t *dep2 = find_colliding_dependency(dep, list);
+
+	/* there is already a node in the graph which describes this dependency */
+	if (dep2 != NULL)
+	{
+		char depbuf2[PKGCONF_ITEM_SIZE];
+
+		PKGCONF_TRACE(client, "dependency collision: [%s/%x] -- [%s/%x]",
+			      dependency_to_str(dep, depbuf, sizeof depbuf), dep->flags,
+			      dependency_to_str(dep2, depbuf2, sizeof depbuf2), dep2->flags);
+
+		/* prefer the uncoloured node, either dep or dep2 */
+		if (dep->flags && dep2->flags == 0)
+		{
+			PKGCONF_TRACE(client, "dropping dependency [%s]@%p because of collision", depbuf, dep);
+
+			pkgconf_dependency_unref(dep->owner, dep);
+			return NULL;
+		}
+		else if (dep2->flags && dep->flags == 0)
+		{
+			PKGCONF_TRACE(client, "dropping dependency [%s]@%p because of collision", depbuf2, dep2);
+
+			pkgconf_node_delete(&dep2->iter, list);
+			pkgconf_dependency_unref(dep2->owner, dep2);
+		}
+		else
+			/* If both dependencies have equal strength, we keep both, because of situations like:
+			 *    Requires: foo > 1, foo < 3
+			 *
+			 * If the situation is that both dependencies are literally equal, it is still harmless because
+			 * fragment deduplication will handle the excessive fragments.
+			 */
+			PKGCONF_TRACE(client, "keeping both dependencies (harmless)");
+	}
+
+	PKGCONF_TRACE(client, "added dependency [%s] to list @%p; flags=%x", dependency_to_str(dep, depbuf, sizeof depbuf), list, dep->flags);
+	pkgconf_node_insert_tail(&dep->iter, pkgconf_dependency_ref(dep->owner, dep), list);
+
+	/* This dependency is intentionally unowned.
+	 *
+	 * Internally we have no use for the returned type, and usually just
+	 * discard it. However, there is a publig pkgconf_dependency_add
+	 * function, which references this return value before returning it,
+	 * giving ownership at that point.
+	 */
+	return dep;
+}
+
+static inline pkgconf_dependency_t *
+pkgconf_dependency_addraw(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, size_t package_sz, const char *version, size_t version_sz, pkgconf_pkg_comparator_t compare, unsigned int flags)
 {
 	pkgconf_dependency_t *dep;
 
-	dep = calloc(sizeof(pkgconf_dependency_t), 1);
+	dep = calloc(1, sizeof(pkgconf_dependency_t));
 	dep->package = pkgconf_strndup(package, package_sz);
 
 	if (version_sz != 0)
 		dep->version = pkgconf_strndup(version, version_sz);
 
 	dep->compare = compare;
+	dep->flags = flags;
+	dep->owner = client;
+	dep->refcount = 0;
 
-	pkgconf_node_insert_tail(&dep->iter, dep, list);
-
-	return dep;
+	return add_or_replace_dependency_node(client, dep, list);
 }
 
 /*
@@ -61,20 +151,22 @@ pkgconf_dependency_addraw(pkgconf_list_t *list, const char *package, size_t pack
  *
  *    Adds a parsed dependency to a dependency list as a dependency node.
  *
+ *    :param pkgconf_client_t* client: The client object that owns the package this dependency list belongs to.
  *    :param pkgconf_list_t* list: The dependency list to add a dependency node to.
  *    :param char* package: The package `atom` to set on the dependency node.
  *    :param char* version: The package `version` to set on the dependency node.
  *    :param pkgconf_pkg_comparator_t compare: The comparison operator to set on the dependency node.
+ *    :param uint flags: Any flags to attach to the dependency node.
  *    :return: A dependency node.
  *    :rtype: pkgconf_dependency_t *
  */
 pkgconf_dependency_t *
-pkgconf_dependency_add(pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare)
+pkgconf_dependency_add(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags)
 {
-	if (version != NULL)
-		return pkgconf_dependency_addraw(list, package, strlen(package), version, strlen(version), compare);
-
-	return pkgconf_dependency_addraw(list, package, strlen(package), NULL, 0, compare);
+	pkgconf_dependency_t *dep;
+	dep = pkgconf_dependency_addraw(client, list, package, strlen(package), version,
+					version != NULL ? strlen(version) : 0, compare, flags);
+	return pkgconf_dependency_ref(dep->owner, dep);
 }
 
 /*
@@ -94,12 +186,83 @@ pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail)
 	pkgconf_node_insert_tail(&tail->iter, tail, list);
 }
 
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
+ *
+ *    Frees a dependency node.
+ *
+ *    :param pkgconf_dependency_t* dep: The dependency node to free.
+ *    :return: nothing
+ */
+void
+pkgconf_dependency_free_one(pkgconf_dependency_t *dep)
+{
+	if (dep->match != NULL)
+		pkgconf_pkg_unref(dep->match->owner, dep->match);
+
+	if (dep->package != NULL)
+		free(dep->package);
+
+	if (dep->version != NULL)
+		free(dep->version);
+
+	free(dep);
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
+ *
+ *    Increases a dependency node's refcount.
+ *
+ *    :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
+ *    :param pkgconf_dependency_t* dep: The dependency to increase the refcount of.
+ *    :return: the dependency node on success, else NULL
+ */
+pkgconf_dependency_t *
+pkgconf_dependency_ref(pkgconf_client_t *client, pkgconf_dependency_t *dep)
+{
+	if (client != dep->owner)
+		return NULL;
+
+	dep->refcount++;
+	PKGCONF_TRACE(client, "%s refcount@%p: %d", dep->package, dep, dep->refcount);
+	return dep;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_dependency_unref(pkgconf_client_t *owner, pkgconf_dependency_t *dep)
+ *
+ *    Decreases a dependency node's refcount and frees it if necessary.
+ *
+ *    :param pkgconf_client_t* owner: The client object which owns the memory of this dependency node.
+ *    :param pkgconf_dependency_t* dep: The dependency to decrease the refcount of.
+ *    :return: nothing
+ */
+void
+pkgconf_dependency_unref(pkgconf_client_t *client, pkgconf_dependency_t *dep)
+{
+	if (client != dep->owner)
+		return;
+
+	--dep->refcount;
+	PKGCONF_TRACE(client, "%s refcount@%p: %d", dep->package, dep, dep->refcount);
+
+	if (dep->refcount <= 0)
+		pkgconf_dependency_free_one(dep);
+}
+
 /*
  * !doc
  *
  * .. c:function:: void pkgconf_dependency_free(pkgconf_list_t *list)
  *
- *    Release a dependency list and it's child dependency nodes.
+ *    Release a dependency list and its child dependency nodes.
  *
  *    :param pkgconf_list_t* list: The dependency list to release.
  *    :return: nothing
@@ -113,14 +276,11 @@ pkgconf_dependency_free(pkgconf_list_t *list)
 	{
 		pkgconf_dependency_t *dep = node->data;
 
-		if (dep->package != NULL)
-			free(dep->package);
-
-		if (dep->version != NULL)
-			free(dep->version);
-
-		free(dep);
+		pkgconf_node_delete(&dep->iter, list);
+		pkgconf_dependency_unref(dep->owner, dep);
 	}
+
+	pkgconf_list_zero(list);
 }
 
 /*
@@ -132,16 +292,18 @@ pkgconf_dependency_free(pkgconf_list_t *list)
  *    Commas are counted as whitespace to allow for constructs such as ``@SUBSTVAR@, zlib`` being processed
  *    into ``, zlib``.
  *
+ *    :param pkgconf_client_t* client: The client object that owns the package this dependency list belongs to.
  *    :param pkgconf_list_t* deplist_head: The dependency list to populate with dependency nodes.
  *    :param char* depends: The dependency data to parse.
+ *    :param uint flags: Any flags to attach to the dependency nodes.
  *    :return: nothing
  */
 void
-pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
+pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags)
 {
 	parse_state_t state = OUTSIDE_MODULE;
 	pkgconf_pkg_comparator_t compare = PKGCONF_CMP_ANY;
-	char cmpname[PKGCONF_BUFSIZE];
+	char cmpname[PKGCONF_ITEM_SIZE];
 	char buf[PKGCONF_BUFSIZE];
 	size_t package_sz = 0, version_sz = 0;
 	char *start = buf;
@@ -149,6 +311,7 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 	char *vstart = NULL;
 	char *package = NULL, *version = NULL;
 	char *cnameptr = cmpname;
+	char *cnameend = cmpname + PKGCONF_ITEM_SIZE - 1;
 
 	memset(cmpname, '\0', sizeof cmpname);
 
@@ -166,11 +329,11 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 			break;
 
 		case INSIDE_MODULE_NAME:
-			if (isspace((unsigned int)*ptr))
+			if (isspace((unsigned char)*ptr))
 			{
 				const char *sptr = ptr;
 
-				while (*sptr && isspace((unsigned int)*sptr))
+				while (*sptr && isspace((unsigned char)*sptr))
 					sptr++;
 
 				if (*sptr == '\0')
@@ -204,11 +367,10 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 
 			if (state == OUTSIDE_MODULE)
 			{
-				pkgconf_dependency_addraw(deplist_head, package, package_sz, NULL, 0, compare);
+				pkgconf_dependency_addraw(client, deplist_head, package, package_sz, NULL, 0, compare, flags);
 
 				compare = PKGCONF_CMP_ANY;
 				package_sz = 0;
-				version_sz = 0;
 			}
 
 			break;
@@ -217,7 +379,8 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 			if (PKGCONF_IS_OPERATOR_CHAR(*ptr))
 			{
 				state = INSIDE_OPERATOR;
-				*cnameptr++ = *ptr;
+				if (cnameptr < cnameend)
+					*cnameptr++ = *ptr;
 			}
 
 			break;
@@ -228,13 +391,13 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 				state = AFTER_OPERATOR;
 				compare = pkgconf_pkg_comparator_lookup_by_name(cmpname);
 			}
-			else
+			else if (cnameptr < cnameend)
 				*cnameptr++ = *ptr;
 
 			break;
 
 		case AFTER_OPERATOR:
-			if (!isspace((unsigned int)*ptr))
+			if (!isspace((unsigned char)*ptr))
 			{
 				vstart = ptr;
 				state = INSIDE_VERSION;
@@ -248,13 +411,12 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
 				version_sz = ptr - vstart;
 				state = OUTSIDE_MODULE;
 
-				pkgconf_dependency_addraw(deplist_head, package, package_sz, version, version_sz, compare);
+				pkgconf_dependency_addraw(client, deplist_head, package, package_sz, version, version_sz, compare, flags);
 
 				compare = PKGCONF_CMP_ANY;
 				cnameptr = cmpname;
 				memset(cmpname, 0, sizeof cmpname);
 				package_sz = 0;
-				version_sz = 0;
 			}
 
 			if (state == OUTSIDE_MODULE)
@@ -279,13 +441,47 @@ pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends)
  *    :param pkgconf_pkg_t* pkg: The package object that owns this dependency list.
  *    :param pkgconf_list_t* deplist: The dependency list to populate with dependency nodes.
  *    :param char* depends: The dependency data to parse.
+ *    :param uint flags: Any flags to attach to the dependency nodes.
  *    :return: nothing
  */
 void
-pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends)
+pkgconf_dependency_parse(pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist, const char *depends, unsigned int flags)
 {
-	char *kvdepends = pkgconf_tuple_parse(client, &pkg->vars, depends);
+	char *kvdepends = pkgconf_tuple_parse(client, &pkg->vars, depends, pkg->flags);
 
-	pkgconf_dependency_parse_str(deplist, kvdepends);
+	pkgconf_dependency_parse_str(client, deplist, kvdepends, flags);
 	free(kvdepends);
 }
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
+ *
+ *    Copies a dependency node to a new one.
+ *
+ *    :param pkgconf_client_t* client: The client object that will own this dependency.
+ *    :param pkgconf_dependency_t* dep: The dependency node to copy.
+ *    :return: a pointer to a new dependency node, else NULL
+ */
+pkgconf_dependency_t *
+pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep)
+{
+	pkgconf_dependency_t *new_dep;
+
+	new_dep = calloc(1, sizeof(pkgconf_dependency_t));
+	new_dep->package = strdup(dep->package);
+
+	if (dep->version != NULL)
+		new_dep->version = strdup(dep->version);
+
+	new_dep->compare = dep->compare;
+	new_dep->flags = dep->flags;
+	new_dep->owner = client;
+	new_dep->refcount = 0;
+
+	if (dep->match != NULL)
+		new_dep->match = pkgconf_pkg_ref(client, dep->match);
+
+	return pkgconf_dependency_ref(client, new_dep);
+}

libpkgconf/fileio.c

@@ -13,13 +13,14 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 char *
 pkgconf_fgetline(char *line, size_t size, FILE *stream)
 {
 	char *s = line;
-	char *end = line + size - 1;
+	char *end = line + size - 2;
 	bool quoted = false;
 	int c = '\0', c2;
 
@@ -28,7 +29,7 @@ pkgconf_fgetline(char *line, size_t size, FILE *stream)
 
 	while (s < end && (c = getc(stream)) != EOF)
 	{
-		if (c == '\\')
+		if (c == '\\' && !quoted)
 		{
 			quoted = true;
 			continue;
@@ -43,6 +44,9 @@ pkgconf_fgetline(char *line, size_t size, FILE *stream)
 				*s++ = c;
 				break;
 			}
+			else
+				*s++ = c;
+
 			quoted = false;
 			continue;
 		}

libpkgconf/fragment.c

@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -34,10 +35,23 @@ struct pkgconf_fragment_check {
 static inline bool
 pkgconf_fragment_is_unmergeable(const char *string)
 {
-	static struct pkgconf_fragment_check check_fragments[] = {
+	static const struct pkgconf_fragment_check check_fragments[] = {
 		{"-framework", 10},
 		{"-isystem", 8},
 		{"-idirafter", 10},
+		{"-pthread", 8},
+		{"-Wa,", 4},
+		{"-Wl,", 4},
+		{"-Wp,", 4},
+		{"-trigraphs", 10},
+		{"-pedantic", 9},
+		{"-ansi", 5},
+		{"-std=", 5},
+		{"-stdlib=", 8},
+		{"-include", 8},
+		{"-nostdinc", 9},
+		{"-nostdlibinc", 12},
+		{"-nobuiltininc", 13},
 	};
 
 	if (*string != '-')
@@ -47,27 +61,22 @@ pkgconf_fragment_is_unmergeable(const char *string)
 		if (!strncmp(string, check_fragments[i].token, check_fragments[i].len))
 			return true;
 
+	/* only one pair of {-flag, arg} may be merged together */
+	if (strchr(string, ' ') != NULL)
+		return false;
+
 	return false;
 }
 
 static inline bool
 pkgconf_fragment_should_munge(const char *string, const char *sysroot_dir)
 {
-	static struct pkgconf_fragment_check check_fragments[] = {
-		{"-isystem", 8},
-		{"-idirafter", 10},
-	};
-
 	if (*string != '/')
 		return false;
 
 	if (sysroot_dir != NULL && strncmp(sysroot_dir, string, strlen(sysroot_dir)))
 		return true;
 
-	for (size_t i = 0; i < PKGCONF_ARRAY_SIZE(check_fragments); i++)
-		if (!strncmp(string, check_fragments[i].token, check_fragments[i].len))
-			return true;
-
 	return false;
 }
 
@@ -84,73 +93,79 @@ pkgconf_fragment_is_special(const char *string)
 }
 
 static inline void
-pkgconf_fragment_munge(const pkgconf_client_t *client, char *buf, size_t buflen, const char *source, const char *sysroot_dir)
+pkgconf_fragment_munge(const pkgconf_client_t *client, char *buf, size_t buflen, const char *source, const char *sysroot_dir, unsigned int flags)
 {
 	*buf = '\0';
 
-	if (sysroot_dir == NULL)
-		sysroot_dir = pkgconf_tuple_find_global(client, "pc_sysrootdir");
+	if (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))
+	{
+		if (sysroot_dir == NULL)
+			sysroot_dir = pkgconf_tuple_find_global(client, "pc_sysrootdir");
 
-	if (pkgconf_fragment_should_munge(source, sysroot_dir))
-		pkgconf_strlcat(buf, sysroot_dir, buflen);
+		if (sysroot_dir != NULL && pkgconf_fragment_should_munge(source, sysroot_dir))
+			pkgconf_strlcat(buf, sysroot_dir, buflen);
+	}
 
 	pkgconf_strlcat(buf, source, buflen);
+
+	if (*buf == '/' && !(client->flags & PKGCONF_PKG_PKGF_DONT_RELOCATE_PATHS))
+		pkgconf_path_relocate(buf, buflen);
 }
 
 static inline char *
-pkgconf_fragment_copy_munged(const pkgconf_client_t *client, const char *source)
+pkgconf_fragment_copy_munged(const pkgconf_client_t *client, const char *source, unsigned int flags)
 {
-	char mungebuf[PKGCONF_BUFSIZE];
-
-	if (client->sysroot_dir == NULL)
-		return strdup(source);
-
-	pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, source, client->sysroot_dir);
-
+	char mungebuf[PKGCONF_ITEM_SIZE];
+	pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, source, client->sysroot_dir, flags);
 	return strdup(mungebuf);
 }
 
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
+ * .. c:function:: void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
  *
  *    Adds a `fragment` of text to a `fragment list`, possibly modifying the fragment if a sysroot is set.
  *
  *    :param pkgconf_client_t* client: The pkgconf client being accessed.
  *    :param pkgconf_list_t* list: The fragment list.
  *    :param char* string: The string of text to add as a fragment to the fragment list.
+ *    :param uint flags: Parsing-related flags for the package.
  *    :return: nothing
  */
 void
-pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string)
+pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags)
 {
 	pkgconf_fragment_t *frag;
 
 	if (*string == '\0')
 		return;
 
-	if (!pkgconf_fragment_is_special(string))
+	if (strlen(string) > 1 && !pkgconf_fragment_is_special(string))
 	{
-		frag = calloc(sizeof(pkgconf_fragment_t), 1);
+		frag = calloc(1, sizeof(pkgconf_fragment_t));
 
 		frag->type = *(string + 1);
-		frag->data = pkgconf_fragment_copy_munged(client, string + 2);
+		frag->data = pkgconf_fragment_copy_munged(client, string + 2, flags);
+
+		PKGCONF_TRACE(client, "added fragment {%c, '%s'} to list @%p", frag->type, frag->data, list);
 	}
 	else
 	{
-		char mungebuf[PKGCONF_BUFSIZE];
+		char mungebuf[PKGCONF_ITEM_SIZE];
 
-		if (list->tail != NULL && list->tail->data != NULL)
+		if (list->tail != NULL && list->tail->data != NULL &&
+		    !(client->flags & PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS))
 		{
 			pkgconf_fragment_t *parent = list->tail->data;
 
-			if (pkgconf_fragment_is_unmergeable(parent->data))
+			/* only attempt to merge 'special' fragments together */
+			if (!parent->type && parent->data != NULL && pkgconf_fragment_is_unmergeable(parent->data))
 			{
 				size_t len;
 				char *newdata;
 
-				pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, string, NULL);
+				pkgconf_fragment_munge(client, mungebuf, sizeof mungebuf, string, NULL, flags);
 
 				len = strlen(parent->data) + strlen(mungebuf) + 2;
 				newdata = malloc(len);
@@ -159,17 +174,30 @@ pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const
 				pkgconf_strlcat(newdata, " ", len);
 				pkgconf_strlcat(newdata, mungebuf, len);
 
+				PKGCONF_TRACE(client, "merging '%s' to '%s' to form fragment {'%s'} in list @%p", mungebuf, parent->data, newdata, list);
+
 				free(parent->data);
 				parent->data = newdata;
+				parent->merged = true;
+
+				/* use a copy operation to force a dedup */
+				pkgconf_node_delete(&parent->iter, list);
+				pkgconf_fragment_copy(client, list, parent, false);
+
+				/* the fragment list now (maybe) has the copied node, so free the original */
+				free(parent->data);
+				free(parent);
 
 				return;
 			}
 		}
 
-		frag = calloc(sizeof(pkgconf_fragment_t), 1);
+		frag = calloc(1, sizeof(pkgconf_fragment_t));
 
 		frag->type = 0;
 		frag->data = strdup(string);
+
+		PKGCONF_TRACE(client, "created special fragment {'%s'} in list @%p", frag->data, list);
 	}
 
 	pkgconf_node_insert_tail(&frag->iter, frag, list);
@@ -261,7 +289,7 @@ pkgconf_fragment_should_merge(const pkgconf_fragment_t *base)
 	case 'I':
 		return true;
 	default:
-		return parent->type == base->type;
+		return !base->type || parent->type == base->type;
 	}
 }
 
@@ -301,34 +329,36 @@ pkgconf_fragment_has_system_dir(const pkgconf_client_t *client, const pkgconf_fr
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsigned int flags, bool is_private)
+ * .. c:function:: void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private)
  *
  *    Copies a `fragment` to another `fragment list`, possibly removing a previous copy of the `fragment`
  *    in a process known as `mergeback`.
  *
+ *    :param pkgconf_client_t* client: The pkgconf client being accessed.
  *    :param pkgconf_list_t* list: The list the fragment is being added to.
  *    :param pkgconf_fragment_t* base: The fragment being copied.
- *    :param uint flags: A set of dependency resolver flags.
  *    :param bool is_private: Whether the fragment list is a `private` fragment list (static linking).
  *    :return: nothing
  */
 void
-pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsigned int flags, bool is_private)
+pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private)
 {
 	pkgconf_fragment_t *frag;
 
-	if ((frag = pkgconf_fragment_exists(list, base, flags, is_private)) != NULL)
+	if ((frag = pkgconf_fragment_exists(list, base, client->flags, is_private)) != NULL)
 	{
 		if (pkgconf_fragment_should_merge(frag))
 			pkgconf_fragment_delete(list, frag);
 	}
-	else if (!is_private && !pkgconf_fragment_can_merge_back(base, flags, is_private) && (pkgconf_fragment_lookup(list, base) != NULL))
+	else if (!is_private && !pkgconf_fragment_can_merge_back(base, client->flags, is_private) && (pkgconf_fragment_lookup(list, base) != NULL))
 		return;
 
-	frag = calloc(sizeof(pkgconf_fragment_t), 1);
+	frag = calloc(1, sizeof(pkgconf_fragment_t));
 
 	frag->type = base->type;
-	frag->data = strdup(base->data);
+	frag->merged = base->merged;
+	if (base->data != NULL)
+		frag->data = strdup(base->data);
 
 	pkgconf_node_insert_tail(&frag->iter, frag, list);
 }
@@ -336,7 +366,33 @@ pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsi
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, unsigned int flags)
+ * .. c:function:: void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base)
+ *
+ *    Copies a `fragment list` to another `fragment list`, possibly removing a previous copy of the fragments
+ *    in a process known as `mergeback`.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client being accessed.
+ *    :param pkgconf_list_t* list: The list the fragments are being added to.
+ *    :param pkgconf_list_t* base: The list the fragments are being copied from.
+ *    :return: nothing
+ */
+void
+pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base)
+{
+	pkgconf_node_t *node;
+
+	PKGCONF_FOREACH_LIST_ENTRY(base->head, node)
+	{
+		pkgconf_fragment_t *frag = node->data;
+
+		pkgconf_fragment_copy(client, list, frag, true);
+	}
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func)
  *
  *    Copies a `fragment list` to another `fragment list` which match a user-specified filtering function.
  *
@@ -344,11 +400,11 @@ pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsi
  *    :param pkgconf_list_t* dest: The destination list.
  *    :param pkgconf_list_t* src: The source list.
  *    :param pkgconf_fragment_filter_func_t filter_func: The filter function to use.
- *    :param uint flags: A set of dependency resolver flags.
+ *    :param void* data: Optional data to pass to the filter function.
  *    :return: nothing
  */
 void
-pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, unsigned int flags)
+pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, void *data)
 {
 	pkgconf_node_t *node;
 
@@ -356,11 +412,56 @@ pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pk
 	{
 		pkgconf_fragment_t *frag = node->data;
 
-		if (filter_func(client, frag, flags))
-			pkgconf_fragment_copy(dest, frag, flags, true);
+		if (filter_func(client, frag, data))
+			pkgconf_fragment_copy(client, dest, frag, true);
 	}
 }
 
+static inline char *
+fragment_quote(const pkgconf_fragment_t *frag)
+{
+	const char *src = frag->data;
+	ssize_t outlen = strlen(src) + 10;
+	char *out, *dst;
+
+	if (frag->data == NULL)
+		return NULL;
+
+	out = dst = calloc(1, outlen);
+
+	for (; *src; src++)
+	{
+		if (((*src < ' ') ||
+		    (*src >= (' ' + (frag->merged ? 1 : 0)) && *src < '$') ||
+		    (*src > '$' && *src < '(') ||
+		    (*src > ')' && *src < '+') ||
+		    (*src > ':' && *src < '=') ||
+		    (*src > '=' && *src < '@') ||
+		    (*src > 'Z' && *src < '\\') ||
+#ifndef _WIN32
+		    (*src == '\\') ||
+#endif
+		    (*src > '\\' && *src < '^') ||
+		    (*src == '`') ||
+		    (*src > 'z' && *src < '~') ||
+		    (*src > '~')))
+			*dst++ = '\\';
+
+		*dst++ = *src;
+
+		if ((ptrdiff_t)(dst - out) + 2 > outlen)
+		{
+			ptrdiff_t offset = dst - out;
+			outlen *= 2;
+			out = realloc(out, outlen);
+			dst = out + offset;
+		}
+	}
+
+	*dst = 0;
+	return out;
+}
+
 static inline size_t
 pkgconf_fragment_len(const pkgconf_fragment_t *frag)
 {
@@ -370,25 +471,20 @@ pkgconf_fragment_len(const pkgconf_fragment_t *frag)
 		len += 2;
 
 	if (frag->data != NULL)
-		len += strlen(frag->data);
+	{
+		char *quoted = fragment_quote(frag);
+		len += strlen(quoted);
+		free(quoted);
+	}
 
 	return len;
 }
 
-/*
- * !doc
- *
- * .. c:function:: size_t pkgconf_fragment_render_len(const pkgconf_list_t *list)
- *
- *    Calculates the required memory to store a `fragment list` when rendered as a string.
- *
- *    :param pkgconf_list_t* list: The `fragment list` being rendered.
- *    :return: the amount of bytes required to represent the `fragment list` when rendered
- *    :rtype: size_t
- */
-size_t
-pkgconf_fragment_render_len(const pkgconf_list_t *list)
+static size_t
+fragment_render_len(const pkgconf_list_t *list, bool escape)
 {
+	(void) escape;
+
 	size_t out = 1;		/* trailing nul */
 	pkgconf_node_t *node;
 
@@ -401,21 +497,11 @@ pkgconf_fragment_render_len(const pkgconf_list_t *list)
 	return out;
 }
 
-/*
- * !doc
- *
- * .. c:function:: void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen)
- *
- *    Renders a `fragment list` into a buffer.
- *
- *    :param pkgconf_list_t* list: The `fragment list` being rendered.
- *    :param char* buf: The buffer to render the fragment list into.
- *    :param size_t buflen: The length of the buffer.
- *    :return: nothing
- */
-void
-pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen)
+static void
+fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool escape)
 {
+	(void) escape;
+
 	pkgconf_node_t *node;
 	char *bptr = buf;
 
@@ -425,9 +511,13 @@ pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen
 	{
 		const pkgconf_fragment_t *frag = node->data;
 		size_t buf_remaining = buflen - (bptr - buf);
+		char *quoted = fragment_quote(frag);
 
-		if (pkgconf_fragment_len(frag) > buf_remaining)
+		if (strlen(quoted) > buf_remaining)
+		{
+			free(quoted);
 			break;
+		}
 
 		if (frag->type)
 		{
@@ -435,15 +525,69 @@ pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen
 			*bptr++ = frag->type;
 		}
 
-		if (frag->data)
-			bptr += pkgconf_strlcpy(bptr, frag->data, buf_remaining);
+		if (quoted != NULL)
+		{
+			bptr += pkgconf_strlcpy(bptr, quoted, buf_remaining);
+			free(quoted);
+		}
 
-		*bptr++ = ' ';
+		if (node->next != NULL)
+			*bptr++ = ' ';
 	}
 
 	*bptr = '\0';
 }
 
+static const pkgconf_fragment_render_ops_t default_render_ops = {
+	.render_len = fragment_render_len,
+	.render_buf = fragment_render_buf
+};
+
+/*
+ * !doc
+ *
+ * .. c:function:: size_t pkgconf_fragment_render_len(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops)
+ *
+ *    Calculates the required memory to store a `fragment list` when rendered as a string.
+ *
+ *    :param pkgconf_list_t* list: The `fragment list` being rendered.
+ *    :param bool escape: Whether or not to escape special shell characters (deprecated).
+ *    :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
+ *    :return: the amount of bytes required to represent the `fragment list` when rendered
+ *    :rtype: size_t
+ */
+size_t
+pkgconf_fragment_render_len(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops)
+{
+	(void) escape;
+
+	ops = ops != NULL ? ops : &default_render_ops;
+	return ops->render_len(list, true);
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool escape, const pkgconf_fragment_render_ops_t *ops)
+ *
+ *    Renders a `fragment list` into a buffer.
+ *
+ *    :param pkgconf_list_t* list: The `fragment list` being rendered.
+ *    :param char* buf: The buffer to render the fragment list into.
+ *    :param size_t buflen: The length of the buffer.
+ *    :param bool escape: Whether or not to escape special shell characters (deprecated).
+ *    :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
+ *    :return: nothing
+ */
+void
+pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen, bool escape, const pkgconf_fragment_render_ops_t *ops)
+{
+	(void) escape;
+
+	ops = ops != NULL ? ops : &default_render_ops;
+	ops->render_buf(list, buf, buflen, true);
+}
+
 /*
  * !doc
  *
@@ -452,16 +596,20 @@ pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t buflen
  *    Allocate memory and render a `fragment list` into it.
  *
  *    :param pkgconf_list_t* list: The `fragment list` being rendered.
+ *    :param bool escape: Whether or not to escape special shell characters (deprecated).
+ *    :param pkgconf_fragment_render_ops_t* ops: An optional ops structure to use for custom renderers, else ``NULL``.
  *    :return: An allocated string containing the rendered `fragment list`.
  *    :rtype: char *
  */
 char *
-pkgconf_fragment_render(const pkgconf_list_t *list)
+pkgconf_fragment_render(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops)
 {
-	size_t buflen = pkgconf_fragment_render_len(list);
+	(void) escape;
+
+	size_t buflen = pkgconf_fragment_render_len(list, true, ops);
 	char *buf = calloc(1, buflen);
 
-	pkgconf_fragment_render_buf(list, buf, buflen);
+	pkgconf_fragment_render_buf(list, buf, buflen, true, ops);
 
 	return buf;
 }
@@ -513,28 +661,51 @@ pkgconf_fragment_free(pkgconf_list_t *list)
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
+ * .. c:function:: bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
  *
  *    Parse a string into a `fragment list`.
  *
  *    :param pkgconf_client_t* client: The pkgconf client being accessed.
  *    :param pkgconf_list_t* list: The `fragment list` to add the fragment entries to.
  *    :param pkgconf_list_t* vars: A list of variables to use for variable substitution.
+ *    :param uint flags: Any parsing flags to be aware of.
  *    :param char* value: The string to parse into fragments.
- *    :return: nothing
+ *    :return: true on success, false on parse error
  */
-void
-pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value)
+bool
+pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags)
 {
-	int i, argc;
+	int i, ret, argc;
 	char **argv;
-	char *repstr = pkgconf_tuple_parse(client, vars, value);
+	char *repstr = pkgconf_tuple_parse(client, vars, value, flags);
 
-	pkgconf_argv_split(repstr, &argc, &argv);
+	PKGCONF_TRACE(client, "post-subst: [%s] -> [%s]", value, repstr);
+
+	ret = pkgconf_argv_split(repstr, &argc, &argv);
+	if (ret < 0)
+	{
+		PKGCONF_TRACE(client, "unable to parse fragment string [%s]", repstr);
+		free(repstr);
+		return false;
+	}
 
 	for (i = 0; i < argc; i++)
-		pkgconf_fragment_add(client, list, argv[i]);
+	{
+		PKGCONF_TRACE(client, "processing %s", argv[i]);
+
+		if (argv[i] == NULL)
+		{
+			PKGCONF_TRACE(client, "parsed fragment string is inconsistent: argc = %d while argv[%d] == NULL", argc, i);
+			pkgconf_argv_free(argv);
+			free(repstr);
+			return false;
+		}
+
+		pkgconf_fragment_add(client, list, argv[i], flags);
+	}
 
 	pkgconf_argv_free(argv);
 	free(repstr);
+
+	return true;
 }

libpkgconf/iter.h

@@ -13,8 +13,12 @@
  * from the use of this software.
  */
 
-#ifndef PKGCONF__ITER_H
-#define PKGCONF__ITER_H
+#ifndef LIBPKGCONF_ITER_H
+#define LIBPKGCONF_ITER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct pkgconf_node_ pkgconf_node_t;
 
@@ -30,6 +34,14 @@ typedef struct {
 
 #define PKGCONF_LIST_INITIALIZER		{ NULL, NULL, 0 }
 
+static inline void
+pkgconf_list_zero(pkgconf_list_t *list)
+{
+	list->head = NULL;
+	list->tail = NULL;
+	list->length = 0;
+}
+
 static inline void
 pkgconf_node_insert(pkgconf_node_t *node, void *data, pkgconf_list_t *list)
 {
@@ -61,7 +73,7 @@ pkgconf_node_insert_tail(pkgconf_node_t *node, void *data, pkgconf_list_t *list)
 
 	node->data = data;
 
-	if (list->head == NULL)
+	if (list->tail == NULL)
 	{
 		list->head = node;
 		list->tail = node;
@@ -94,4 +106,8 @@ pkgconf_node_delete(pkgconf_node_t *node, pkgconf_list_t *list)
 		node->next->prev = node->prev;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

libpkgconf/libpkgconf-api.h

@@ -0,0 +1,19 @@
+#ifndef LIBPKGCONF_LIBPKGCONF_API_H
+#define LIBPKGCONF_LIBPKGCONF_API_H
+
+/* Makefile.am specifies visibility using the libtool option -export-symbols-regex '^pkgconf_'
+ * Unfortunately, that is not available when building with meson, so use attributes instead.
+ */
+#if defined(PKGCONFIG_IS_STATIC)
+# define PKGCONF_API
+#elif defined(_WIN32) || defined(_WIN64)
+# if defined(LIBPKGCONF_EXPORT) || defined(DLL_EXPORT)
+#  define PKGCONF_API __declspec(dllexport)
+# else
+#  define PKGCONF_API __declspec(dllimport)
+# endif
+#else
+# define PKGCONF_API __attribute__((visibility("default")))
+#endif
+
+#endif

libpkgconf/libpkgconf.h

@@ -16,10 +16,20 @@
 #ifndef LIBPKGCONF__LIBPKGCONF_H
 #define LIBPKGCONF__LIBPKGCONF_H
 
-#include <libpkgconf/stdinc.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <libpkgconf/libpkgconf-api.h>
 #include <libpkgconf/iter.h>
 #include <libpkgconf/bsdstubs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* pkg-config uses ';' on win32 as ':' is part of path */
 #ifdef _WIN32
 #define PKG_CONFIG_PATH_SEP_S   ";"
@@ -33,6 +43,10 @@
 #define PKG_DIR_SEP_S   '/'
 #endif
 
+#ifdef _WIN32
+#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
+#endif
+
 #define PKGCONF_BUFSIZE	(65535)
 
 typedef enum {
@@ -53,6 +67,8 @@ typedef struct pkgconf_tuple_ pkgconf_tuple_t;
 typedef struct pkgconf_fragment_ pkgconf_fragment_t;
 typedef struct pkgconf_path_ pkgconf_path_t;
 typedef struct pkgconf_client_ pkgconf_client_t;
+typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
+typedef struct pkgconf_queue_ pkgconf_queue_t;
 
 #define PKGCONF_ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 
@@ -65,11 +81,21 @@ typedef struct pkgconf_client_ pkgconf_client_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
+#define LIBPKGCONF_VERSION	20200
+#define LIBPKGCONF_VERSION_STR	"2.2.0"
+
+struct pkgconf_queue_ {
+	pkgconf_node_t iter;
+	char *package;
+};
+
 struct pkgconf_fragment_ {
 	pkgconf_node_t iter;
 
 	char type;
 	char *data;
+
+	bool merged;
 };
 
 struct pkgconf_dependency_ {
@@ -79,6 +105,12 @@ struct pkgconf_dependency_ {
 	pkgconf_pkg_comparator_t compare;
 	char *version;
 	pkgconf_pkg_t *parent;
+	pkgconf_pkg_t *match;
+
+	unsigned int flags;
+
+	int refcount;
+	pkgconf_client_t *owner;
 };
 
 struct pkgconf_tuple_ {
@@ -86,8 +118,12 @@ struct pkgconf_tuple_ {
 
 	char *key;
 	char *value;
+
+	unsigned int flags;
 };
 
+#define PKGCONF_PKG_TUPLEF_OVERRIDE		0x1
+
 struct pkgconf_path_ {
 	pkgconf_node_t lnode;
 
@@ -96,15 +132,15 @@ struct pkgconf_path_ {
 	void *handle_device;
 };
 
-#define PKGCONF_PKG_PROPF_NONE			0x0
-#define PKGCONF_PKG_PROPF_VIRTUAL		0x1
-#define PKGCONF_PKG_PROPF_CACHED		0x2
-#define PKGCONF_PKG_PROPF_SEEN			0x4
-#define PKGCONF_PKG_PROPF_UNINSTALLED		0x8
+#define PKGCONF_PKG_PROPF_NONE			0x00
+#define PKGCONF_PKG_PROPF_STATIC		0x01
+#define PKGCONF_PKG_PROPF_CACHED		0x02
+#define PKGCONF_PKG_PROPF_UNINSTALLED		0x08
+#define PKGCONF_PKG_PROPF_VIRTUAL		0x10
+#define PKGCONF_PKG_PROPF_ANCESTOR		0x20
+#define PKGCONF_PKG_PROPF_VISITED_PRIVATE	0x40
 
 struct pkgconf_pkg_ {
-	pkgconf_node_t cache_iter;
-
 	int refcount;
 	char *id;
 	char *filename;
@@ -113,13 +149,17 @@ struct pkgconf_pkg_ {
 	char *description;
 	char *url;
 	char *pc_filedir;
+	char *license;
+	char *maintainer;
+	char *copyright;
+	char *why;
 
 	pkgconf_list_t libs;
 	pkgconf_list_t libs_private;
 	pkgconf_list_t cflags;
 	pkgconf_list_t cflags_private;
 
-	pkgconf_list_t requires;
+	pkgconf_list_t required;		/* this used to be requires but that is now a reserved keyword */
 	pkgconf_list_t requires_private;
 	pkgconf_list_t conflicts;
 	pkgconf_list_t provides;
@@ -127,16 +167,26 @@ struct pkgconf_pkg_ {
 	pkgconf_list_t vars;
 
 	unsigned int flags;
+
+	pkgconf_client_t *owner;
+
+	/* these resources are owned by the package and do not need special management,
+	 * under no circumstance attempt to allocate or free objects belonging to these pointers
+	 */
+	pkgconf_tuple_t *orig_prefix;
+	pkgconf_tuple_t *prefix;
+
+	uint64_t serial;
+	uint64_t identifier;
 };
 
 typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data);
-typedef void (*pkgconf_pkg_traverse_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data, unsigned int flags);
-typedef bool (*pkgconf_queue_apply_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int maxdepth, unsigned int flags);
-typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, const void *data);
+typedef void (*pkgconf_pkg_traverse_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data);
+typedef bool (*pkgconf_queue_apply_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int maxdepth);
+typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, void *data);
 
 struct pkgconf_client_ {
 	pkgconf_list_t dir_list;
-	pkgconf_list_t pkg_cache;
 
 	pkgconf_list_t filter_libdirs;
 	pkgconf_list_t filter_includedirs;
@@ -144,38 +194,95 @@ struct pkgconf_client_ {
 	pkgconf_list_t global_vars;
 
 	void *error_handler_data;
+	void *warn_handler_data;
+	void *trace_handler_data;
+
 	pkgconf_error_handler_func_t error_handler;
+	pkgconf_error_handler_func_t warn_handler;
+	pkgconf_error_handler_func_t trace_handler;
 
 	FILE *auditf;
 
 	char *sysroot_dir;
 	char *buildroot_dir;
+
+	unsigned int flags;
+
+	char *prefix_varname;
+
+	bool already_sent_notice;
+
+	uint64_t serial;
+	uint64_t identifier;
+
+	pkgconf_pkg_t **cache_table;
+	size_t cache_count;
+};
+
+struct pkgconf_cross_personality_ {
+	const char *name;
+
+	pkgconf_list_t dir_list;
+
+	pkgconf_list_t filter_libdirs;
+	pkgconf_list_t filter_includedirs;
+
+	char *sysroot_dir;
+
+	bool want_default_static;
+	bool want_default_pure;
 };
 
 /* client.c */
-void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data);
-pkgconf_client_t *pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data);
-void pkgconf_client_deinit(pkgconf_client_t *client);
-void pkgconf_client_free(pkgconf_client_t *client);
-const char *pkgconf_client_get_sysroot_dir(const pkgconf_client_t *client);
-void pkgconf_client_set_sysroot_dir(pkgconf_client_t *client, const char *sysroot_dir);
-const char *pkgconf_client_get_buildroot_dir(const pkgconf_client_t *client);
-void pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buildroot_dir);
+PKGCONF_API void pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality);
+PKGCONF_API pkgconf_client_t * pkgconf_client_new(pkgconf_error_handler_func_t error_handler, void *error_handler_data, const pkgconf_cross_personality_t *personality);
+PKGCONF_API void pkgconf_client_deinit(pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_free(pkgconf_client_t *client);
+PKGCONF_API const char *pkgconf_client_get_sysroot_dir(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_sysroot_dir(pkgconf_client_t *client, const char *sysroot_dir);
+PKGCONF_API const char *pkgconf_client_get_buildroot_dir(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buildroot_dir);
+PKGCONF_API unsigned int pkgconf_client_get_flags(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_flags(pkgconf_client_t *client, unsigned int flags);
+PKGCONF_API const char *pkgconf_client_get_prefix_varname(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_prefix_varname(pkgconf_client_t *client, const char *prefix_varname);
+PKGCONF_API pkgconf_error_handler_func_t pkgconf_client_get_warn_handler(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_warn_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t warn_handler, void *warn_handler_data);
+PKGCONF_API pkgconf_error_handler_func_t pkgconf_client_get_error_handler(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_error_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t error_handler, void *error_handler_data);
+PKGCONF_API pkgconf_error_handler_func_t pkgconf_client_get_trace_handler(const pkgconf_client_t *client);
+PKGCONF_API void pkgconf_client_set_trace_handler(pkgconf_client_t *client, pkgconf_error_handler_func_t trace_handler, void *trace_handler_data);
+PKGCONF_API void pkgconf_client_dir_list_build(pkgconf_client_t *client, const pkgconf_cross_personality_t *personality);
 
-#define PKGCONF_IS_MODULE_SEPARATOR(c) ((c) == ',' || isspace ((unsigned int)(c)))
+/* personality.c */
+PKGCONF_API pkgconf_cross_personality_t *pkgconf_cross_personality_default(void);
+PKGCONF_API pkgconf_cross_personality_t *pkgconf_cross_personality_find(const char *triplet);
+PKGCONF_API void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *personality);
+
+#define PKGCONF_IS_MODULE_SEPARATOR(c) ((c) == ',' || isspace ((unsigned char)(c)))
 #define PKGCONF_IS_OPERATOR_CHAR(c) ((c) == '<' || (c) == '>' || (c) == '!' || (c) == '=')
 
-#define PKGCONF_PKG_PKGF_NONE				0x000
-#define PKGCONF_PKG_PKGF_SEARCH_PRIVATE			0x001
-#define PKGCONF_PKG_PKGF_ENV_ONLY			0x002
-#define PKGCONF_PKG_PKGF_NO_UNINSTALLED			0x004
-#define PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL		0x008
-#define PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS	0x010
-#define PKGCONF_PKG_PKGF_SKIP_CONFLICTS			0x020
-#define PKGCONF_PKG_PKGF_NO_CACHE			0x040
-#define PKGCONF_PKG_PKGF_SKIP_ERRORS			0x080
-#define PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE		0x100
-#define PKGCONF_PKG_PKGF_SKIP_PROVIDES			0x200
+#define PKGCONF_PKG_PKGF_NONE				0x0000
+#define PKGCONF_PKG_PKGF_SEARCH_PRIVATE			0x0001
+#define PKGCONF_PKG_PKGF_ENV_ONLY			0x0002
+#define PKGCONF_PKG_PKGF_NO_UNINSTALLED			0x0004
+#define PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL		0x0008
+#define PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS	0x0010
+#define PKGCONF_PKG_PKGF_SKIP_CONFLICTS			0x0020
+#define PKGCONF_PKG_PKGF_NO_CACHE			0x0040
+#define PKGCONF_PKG_PKGF_SKIP_ERRORS			0x0080
+#define PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE		0x0100
+#define PKGCONF_PKG_PKGF_SKIP_PROVIDES			0x0200
+#define PKGCONF_PKG_PKGF_REDEFINE_PREFIX		0x0400
+#define PKGCONF_PKG_PKGF_DONT_RELOCATE_PATHS		0x0800
+#define PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS		0x1000
+#define PKGCONF_PKG_PKGF_DONT_FILTER_INTERNAL_CFLAGS	0x2000
+#define PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS	0x4000
+#define PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES		0x8000
+#define PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES         0x10000
+
+#define PKGCONF_PKG_DEPF_INTERNAL		0x1
+#define PKGCONF_PKG_DEPF_PRIVATE		0x2
 
 #define PKGCONF_PKG_ERRF_OK			0x0
 #define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND	0x1
@@ -183,7 +290,6 @@ void pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buil
 #define PKGCONF_PKG_ERRF_PACKAGE_CONFLICT	0x4
 #define PKGCONF_PKG_ERRF_DEPGRAPH_BREAK		0x8
 
-/* pkg.c */
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #define PRINTFLIKE(fmtarg, firstvararg) \
         __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
@@ -194,88 +300,129 @@ void pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buil
 #define DEPRECATED
 #endif /* defined(__INTEL_COMPILER) || defined(__GNUC__) */
 
-bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
-bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data);
+/* parser.c */
+typedef void (*pkgconf_parser_operand_func_t)(void *data, const size_t lineno, const char *key, const char *value);
+typedef void (*pkgconf_parser_warn_func_t)(void *data, const char *fmt, ...);
 
-pkgconf_pkg_t *pkgconf_pkg_ref(const pkgconf_client_t *client, pkgconf_pkg_t *pkg);
-void pkgconf_pkg_unref(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
-void pkgconf_pkg_free(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
-pkgconf_pkg_t *pkgconf_pkg_find(pkgconf_client_t *client, const char *name, unsigned int flags);
-unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth, unsigned int flags);
-unsigned int pkgconf_pkg_verify_graph(pkgconf_client_t *client, pkgconf_pkg_t *root, int depth, unsigned int flags);
-pkgconf_pkg_t *pkgconf_pkg_verify_dependency(pkgconf_client_t *client, pkgconf_dependency_t *pkgdep, unsigned int flags, unsigned int *eflags);
-const char *pkgconf_pkg_get_comparator(const pkgconf_dependency_t *pkgdep);
-unsigned int pkgconf_pkg_cflags(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth, unsigned int flags);
-unsigned int pkgconf_pkg_libs(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth, unsigned int flags);
-pkgconf_pkg_comparator_t pkgconf_pkg_comparator_lookup_by_name(const char *name);
-pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name);
+PKGCONF_API void pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_operand_func_t *ops, const pkgconf_parser_warn_func_t warnfunc, const char *filename);
 
-int pkgconf_compare_version(const char *a, const char *b);
-pkgconf_pkg_t *pkgconf_scan_all(pkgconf_client_t *client, void *ptr, pkgconf_pkg_iteration_func_t func);
-void pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags);
+/* pkg.c */
+PKGCONF_API bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
+PKGCONF_API bool pkgconf_warn(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
+PKGCONF_API bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t lineno, const char *funcname, const char *format, ...) PRINTFLIKE(5, 6);
+PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data);
+
+#ifndef PKGCONF_LITE
+#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+#define PKGCONF_TRACE(client, ...) do { \
+		pkgconf_trace(client, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__); \
+	} while (0)
+#else
+#define PKGCONF_TRACE(client, ...) do { \
+		pkgconf_trace(client, __FILE__, __LINE__, __func__, __VA_ARGS__); \
+	} while (0)
+#endif
+#else
+#define PKGCONF_TRACE(client, ...)
+#endif
+
+PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_ref(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
+PKGCONF_API void pkgconf_pkg_unref(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
+PKGCONF_API void pkgconf_pkg_free(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
+PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_find(pkgconf_client_t *client, const char *name);
+PKGCONF_API unsigned int pkgconf_pkg_traverse(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_pkg_traverse_func_t func, void *data, int maxdepth, unsigned int skip_flags);
+PKGCONF_API unsigned int pkgconf_pkg_verify_graph(pkgconf_client_t *client, pkgconf_pkg_t *root, int depth);
+PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_verify_dependency(pkgconf_client_t *client, pkgconf_dependency_t *pkgdep, unsigned int *eflags);
+PKGCONF_API const char *pkgconf_pkg_get_comparator(const pkgconf_dependency_t *pkgdep);
+PKGCONF_API unsigned int pkgconf_pkg_cflags(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth);
+PKGCONF_API unsigned int pkgconf_pkg_libs(pkgconf_client_t *client, pkgconf_pkg_t *root, pkgconf_list_t *list, int maxdepth);
+PKGCONF_API pkgconf_pkg_comparator_t pkgconf_pkg_comparator_lookup_by_name(const char *name);
+PKGCONF_API pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name);
+
+PKGCONF_API int pkgconf_compare_version(const char *a, const char *b);
+PKGCONF_API pkgconf_pkg_t *pkgconf_scan_all(pkgconf_client_t *client, void *ptr, pkgconf_pkg_iteration_func_t func);
 
 /* parse.c */
-pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *path, FILE *f);
-void pkgconf_dependency_parse_str(pkgconf_list_t *deplist_head, const char *depends);
-void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends);
-void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail);
-void pkgconf_dependency_free(pkgconf_list_t *list);
-pkgconf_dependency_t *pkgconf_dependency_add(pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare);
+PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *path, FILE *f, unsigned int flags);
+PKGCONF_API void pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
+PKGCONF_API void pkgconf_dependency_parse(pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends, unsigned int flags);
+PKGCONF_API void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail);
+PKGCONF_API void pkgconf_dependency_free(pkgconf_list_t *list);
+PKGCONF_API void pkgconf_dependency_free_one(pkgconf_dependency_t *dep);
+PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_add(pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare, unsigned int flags);
+PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_ref(pkgconf_client_t *client, pkgconf_dependency_t *dep);
+PKGCONF_API void pkgconf_dependency_unref(pkgconf_client_t *client, pkgconf_dependency_t *dep);
+PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_copy(pkgconf_client_t *client, const pkgconf_dependency_t *dep);
 
 /* argvsplit.c */
-int pkgconf_argv_split(const char *src, int *argc, char ***argv);
-void pkgconf_argv_free(char **argv);
+PKGCONF_API int pkgconf_argv_split(const char *src, int *argc, char ***argv);
+PKGCONF_API void pkgconf_argv_free(char **argv);
 
 /* fragment.c */
-typedef bool (*pkgconf_fragment_filter_func_t)(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, unsigned int flags);
-void pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value);
-void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string);
-void pkgconf_fragment_copy(pkgconf_list_t *list, const pkgconf_fragment_t *base, unsigned int flags, bool is_private);
-void pkgconf_fragment_delete(pkgconf_list_t *list, pkgconf_fragment_t *node);
-void pkgconf_fragment_free(pkgconf_list_t *list);
-void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, unsigned int flags);
-size_t pkgconf_fragment_render_len(const pkgconf_list_t *list);
-void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t len);
-char *pkgconf_fragment_render(const pkgconf_list_t *list);
-bool pkgconf_fragment_has_system_dir(const pkgconf_client_t *client, const pkgconf_fragment_t *frag);
+typedef struct pkgconf_fragment_render_ops_ {
+	size_t (*render_len)(const pkgconf_list_t *list, bool escape);
+	void (*render_buf)(const pkgconf_list_t *list, char *buf, size_t len, bool escape);
+} pkgconf_fragment_render_ops_t;
+
+typedef bool (*pkgconf_fragment_filter_func_t)(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void *data);
+PKGCONF_API bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags);
+PKGCONF_API void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags);
+PKGCONF_API void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private);
+PKGCONF_API void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base);
+PKGCONF_API void pkgconf_fragment_delete(pkgconf_list_t *list, pkgconf_fragment_t *node);
+PKGCONF_API void pkgconf_fragment_free(pkgconf_list_t *list);
+PKGCONF_API void pkgconf_fragment_filter(const pkgconf_client_t *client, pkgconf_list_t *dest, pkgconf_list_t *src, pkgconf_fragment_filter_func_t filter_func, void *data);
+PKGCONF_API size_t pkgconf_fragment_render_len(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops);
+PKGCONF_API void pkgconf_fragment_render_buf(const pkgconf_list_t *list, char *buf, size_t len, bool escape, const pkgconf_fragment_render_ops_t *ops);
+PKGCONF_API char *pkgconf_fragment_render(const pkgconf_list_t *list, bool escape, const pkgconf_fragment_render_ops_t *ops);
+PKGCONF_API bool pkgconf_fragment_has_system_dir(const pkgconf_client_t *client, const pkgconf_fragment_t *frag);
 
 /* fileio.c */
-char *pkgconf_fgetline(char *line, size_t size, FILE *stream);
+PKGCONF_API char *pkgconf_fgetline(char *line, size_t size, FILE *stream);
 
 /* tuple.c */
-pkgconf_tuple_t *pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *parent, const char *key, const char *value, bool parse);
-char *pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key);
-char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *list, const char *value);
-void pkgconf_tuple_free(pkgconf_list_t *list);
-void pkgconf_tuple_free_entry(pkgconf_tuple_t *tuple, pkgconf_list_t *list);
-void pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *value);
-char *pkgconf_tuple_find_global(const pkgconf_client_t *client, const char *key);
-void pkgconf_tuple_free_global(pkgconf_client_t *client);
-void pkgconf_tuple_define_global(pkgconf_client_t *client, const char *kv);
+PKGCONF_API pkgconf_tuple_t *pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *parent, const char *key, const char *value, bool parse, unsigned int flags);
+PKGCONF_API char *pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key);
+PKGCONF_API char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *list, const char *value, unsigned int flags);
+PKGCONF_API void pkgconf_tuple_free(pkgconf_list_t *list);
+PKGCONF_API void pkgconf_tuple_free_entry(pkgconf_tuple_t *tuple, pkgconf_list_t *list);
+PKGCONF_API void pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *value);
+PKGCONF_API char *pkgconf_tuple_find_global(const pkgconf_client_t *client, const char *key);
+PKGCONF_API void pkgconf_tuple_free_global(pkgconf_client_t *client);
+PKGCONF_API void pkgconf_tuple_define_global(pkgconf_client_t *client, const char *kv);
 
 /* queue.c */
-void pkgconf_queue_push(pkgconf_list_t *list, const char *package);
-bool pkgconf_queue_compile(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list);
-void pkgconf_queue_free(pkgconf_list_t *list);
-bool pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data);
-bool pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, int maxdepth, unsigned int flags);
+PKGCONF_API void pkgconf_queue_push(pkgconf_list_t *list, const char *package);
+PKGCONF_API bool pkgconf_queue_compile(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list);
+PKGCONF_API bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth);
+PKGCONF_API void pkgconf_queue_free(pkgconf_list_t *list);
+PKGCONF_API bool pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data);
+PKGCONF_API bool pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, int maxdepth);
+PKGCONF_API void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world);
 
 /* cache.c */
-pkgconf_pkg_t *pkgconf_cache_lookup(const pkgconf_client_t *client, const char *id);
-void pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
-void pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
-void pkgconf_cache_free(pkgconf_client_t *client);
+PKGCONF_API pkgconf_pkg_t *pkgconf_cache_lookup(pkgconf_client_t *client, const char *id);
+PKGCONF_API void pkgconf_cache_add(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
+PKGCONF_API void pkgconf_cache_remove(pkgconf_client_t *client, pkgconf_pkg_t *pkg);
+PKGCONF_API void pkgconf_cache_free(pkgconf_client_t *client);
 
 /* audit.c */
-void pkgconf_audit_set_log(pkgconf_client_t *client, FILE *auditf);
-void pkgconf_audit_log(pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
-void pkgconf_audit_log_dependency(pkgconf_client_t *client, const pkgconf_pkg_t *dep, const pkgconf_dependency_t *depnode);
+PKGCONF_API void pkgconf_audit_set_log(pkgconf_client_t *client, FILE *auditf);
+PKGCONF_API void pkgconf_audit_log(pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
+PKGCONF_API void pkgconf_audit_log_dependency(pkgconf_client_t *client, const pkgconf_pkg_t *dep, const pkgconf_dependency_t *depnode);
 
 /* path.c */
-void pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter);
-size_t pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter);
-size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter);
-bool pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist);
-void pkgconf_path_free(pkgconf_list_t *dirlist);
+PKGCONF_API void pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter);
+PKGCONF_API void pkgconf_path_prepend(const char *text, pkgconf_list_t *dirlist, bool filter);
+PKGCONF_API size_t pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter);
+PKGCONF_API size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter);
+PKGCONF_API bool pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist);
+PKGCONF_API void pkgconf_path_free(pkgconf_list_t *dirlist);
+PKGCONF_API bool pkgconf_path_relocate(char *buf, size_t buflen);
+PKGCONF_API void pkgconf_path_copy_list(pkgconf_list_t *dst, const pkgconf_list_t *src);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif

libpkgconf/meson.build

@@ -0,0 +1,12 @@
+configure_file(input : 'config.h.meson',
+  output : 'config.h',
+  configuration : cdata)
+
+
+install_headers('libpkgconf.h',
+  'stdinc.h',
+  'iter.h',
+  'bsdstubs.h',
+  'libpkgconf-api.h',
+  subdir : 'pkgconf/libpkgconf')
+

libpkgconf/parser.c

@@ -0,0 +1,106 @@
+/*
+ * parser.c
+ * rfc822 message parser
+ *
+ * Copyright (c) 2018 pkgconf authors (see AUTHORS).
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+#include <libpkgconf/config.h>
+#include <libpkgconf/stdinc.h>
+#include <libpkgconf/libpkgconf.h>
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f)
+ *
+ *    Parse a .pc file into a pkgconf_pkg_t object structure.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
+ *    :param char* filename: The filename of the package file (including full path).
+ *    :param FILE* f: The file object to read from.
+ *    :returns: A ``pkgconf_pkg_t`` object which contains the package data.
+ *    :rtype: pkgconf_pkg_t *
+ */
+void
+pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_operand_func_t *ops, const pkgconf_parser_warn_func_t warnfunc, const char *filename)
+{
+	char readbuf[PKGCONF_BUFSIZE];
+	size_t lineno = 0;
+
+	while (pkgconf_fgetline(readbuf, PKGCONF_BUFSIZE, f) != NULL)
+	{
+		char op, *p, *key, *value;
+		bool warned_key_whitespace = false, warned_value_whitespace = false;
+
+		lineno++;
+
+		p = readbuf;
+		while (*p && isspace((unsigned char)*p))
+			p++;
+		if (*p && p != readbuf)
+		{
+			warnfunc(data, "%s:" SIZE_FMT_SPECIFIER ": warning: whitespace encountered while parsing key section\n",
+				filename, lineno);
+			warned_key_whitespace = true;
+		}
+		key = p;
+		while (*p && (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || *p == '_' || *p == '.'))
+			p++;
+
+		if (!isalpha((unsigned char)*key) &&
+		    !isdigit((unsigned char)*p))
+			continue;
+
+		while (*p && isspace((unsigned char)*p))
+		{
+			if (!warned_key_whitespace)
+			{
+				warnfunc(data, "%s:" SIZE_FMT_SPECIFIER ": warning: whitespace encountered while parsing key section\n",
+					filename, lineno);
+				warned_key_whitespace = true;
+			}
+
+			/* set to null to avoid trailing spaces in key */
+			*p = '\0';
+			p++;
+		}
+
+		op = *p;
+		if (*p != '\0')
+		{
+			*p = '\0';
+			p++;
+		}
+
+		while (*p && isspace((unsigned char)*p))
+			p++;
+
+		value = p;
+		p = value + (strlen(value) - 1);
+		while (*p && isspace((unsigned char) *p) && p > value)
+		{
+			if (!warned_value_whitespace && op == '=')
+			{
+				warnfunc(data, "%s:" SIZE_FMT_SPECIFIER ": warning: trailing whitespace encountered while parsing value section\n",
+					filename, lineno);
+				warned_value_whitespace = true;
+			}
+
+			*p = '\0';
+			p--;
+		}
+		if (ops[(unsigned char) op])
+			ops[(unsigned char) op](data, lineno, key, value);
+	}
+
+	fclose(f);
+}

libpkgconf/path.c

@@ -13,10 +13,11 @@
  * from the use of this software.
  */
 
-#include <libpkgconf/libpkgconf.h>
 #include <libpkgconf/config.h>
+#include <libpkgconf/stdinc.h>
+#include <libpkgconf/libpkgconf.h>
 
-#ifdef HAVE_SYS_STAT_H
+#if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32)
 # include <sys/stat.h>
 # define PKGCONF_CACHE_INODES
 #endif
@@ -35,7 +36,7 @@ path_list_contains_entry(const char *text, pkgconf_list_t *dirlist)
 		pkgconf_path_t *pn = n->data;
 
 #ifdef PKGCONF_CACHE_INODES
-		if (((dev_t) pn->handle_device) == st->st_dev && ((ino_t) pn->handle_path) == st->st_ino)
+		if (pn->handle_device == (void *)(intptr_t)st->st_dev && pn->handle_path == (void *)(intptr_t)st->st_ino)
 			return true;
 #endif
 
@@ -57,6 +58,51 @@ path_list_contains_entry(const char *text, pkgconf_list_t *dirlist)
  * variables.
  */
 
+static pkgconf_path_t *
+prepare_path_node(const char *text, pkgconf_list_t *dirlist, bool filter)
+{
+	pkgconf_path_t *node;
+	char path[PKGCONF_ITEM_SIZE];
+
+	pkgconf_strlcpy(path, text, sizeof path);
+	pkgconf_path_relocate(path, sizeof path);
+
+#ifdef PKGCONF_CACHE_INODES
+	struct stat st;
+
+	if (filter)
+	{
+		if (lstat(path, &st) == -1)
+			return NULL;
+		if (S_ISLNK(st.st_mode))
+		{
+			char pathbuf[PKGCONF_ITEM_SIZE * 4];
+			char *linkdest = realpath(path, pathbuf);
+
+			if (linkdest != NULL && stat(linkdest, &st) == -1)
+				return NULL;
+		}
+		if (path_list_contains_entry(path, dirlist, &st))
+			return NULL;
+	}
+#else
+	if (filter && path_list_contains_entry(path, dirlist))
+		return NULL;
+#endif
+
+	node = calloc(1, sizeof(pkgconf_path_t));
+	node->path = strdup(path);
+
+#ifdef PKGCONF_CACHE_INODES
+	if (filter) {
+		node->handle_path = (void *)(intptr_t) st.st_ino;
+		node->handle_device = (void *)(intptr_t) st.st_dev;
+	}
+#endif
+
+	return node;
+}
+
 /*
  * !doc
  *
@@ -72,30 +118,35 @@ path_list_contains_entry(const char *text, pkgconf_list_t *dirlist)
 void
 pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
 {
-	pkgconf_path_t *node;
-#ifdef PKGCONF_CACHE_INODES
-	struct stat st;
-
-	if (stat(text, &st) == -1)
+	pkgconf_path_t *node = prepare_path_node(text, dirlist, filter);
+	if (node == NULL)
 		return;
 
-	if (filter && path_list_contains_entry(text, dirlist, &st))
-		return;
-#else
-	if (filter && path_list_contains_entry(text, dirlist))
-		return;
-#endif
-
-	node = calloc(sizeof(pkgconf_path_t), 1);
-	node->path = strdup(text);
-#ifdef PKGCONF_CACHE_INODES
-	node->handle_path = (void *)(intptr_t) st.st_ino;
-	node->handle_device = (void *)(intptr_t) st.st_dev;
-#endif
-
 	pkgconf_node_insert_tail(&node->lnode, node, dirlist);
 }
 
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_path_prepend(const char *text, pkgconf_list_t *dirlist)
+ *
+ *    Prepends a path node to a path list.  If the path is already in the list, do nothing.
+ *
+ *    :param char* text: The path text to add as a path node.
+ *    :param pkgconf_list_t* dirlist: The path list to add the path node to.
+ *    :param bool filter: Whether to perform duplicate filtering.
+ *    :return: nothing
+ */
+void
+pkgconf_path_prepend(const char *text, pkgconf_list_t *dirlist, bool filter)
+{
+	pkgconf_path_t *node = prepare_path_node(text, dirlist, filter);
+	if (node == NULL)
+		return;
+
+	pkgconf_node_insert(&node->lnode, node, dirlist);
+}
+
 /*
  * !doc
  *
@@ -133,12 +184,12 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter)
 /*
  * !doc
  *
- * .. c:function:: size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist)
+ * .. c:function:: size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist)
  *
  *    Adds the paths specified in an environment variable to a path list.  If the environment variable is not set,
  *    an optional default set of paths is added.
  *
- *    :param char* environ: The environment variable to look up.
+ *    :param char* envvarname: The environment variable to look up.
  *    :param char* fallback: The fallback paths to use if the environment variable is not set.
  *    :param pkgconf_list_t* dirlist: The path list to add the path nodes to.
  *    :param bool filter: Whether to perform duplicate filtering.
@@ -146,11 +197,11 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter)
  *    :rtype: size_t
  */
 size_t
-pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter)
+pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter)
 {
 	const char *data;
 
-	data = getenv(environ);
+	data = getenv(envvarname);
 	if (data != NULL)
 		return pkgconf_path_split(data, dirlist, filter);
 
@@ -177,18 +228,56 @@ bool
 pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist)
 {
 	pkgconf_node_t *n = NULL;
+	char relocated[PKGCONF_ITEM_SIZE];
+	const char *cpath = path;
+
+	pkgconf_strlcpy(relocated, path, sizeof relocated);
+	if (pkgconf_path_relocate(relocated, sizeof relocated))
+		cpath = relocated;
 
 	PKGCONF_FOREACH_LIST_ENTRY(dirlist->head, n)
 	{
 		pkgconf_path_t *pnode = n->data;
 
-		if (!strcmp(pnode->path, path))
+		if (!strcmp(pnode->path, cpath))
 			return true;
 	}
 
 	return false;
 }
 
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_path_copy_list(pkgconf_list_t *dst, const pkgconf_list_t *src)
+ *
+ *    Copies a path list to another path list.
+ *
+ *    :param pkgconf_list_t* dst: The path list to copy to.
+ *    :param pkgconf_list_t* src: The path list to copy from.
+ *    :return: nothing
+ */
+void
+pkgconf_path_copy_list(pkgconf_list_t *dst, const pkgconf_list_t *src)
+{
+	pkgconf_node_t *n;
+
+	PKGCONF_FOREACH_LIST_ENTRY(src->head, n)
+	{
+		pkgconf_path_t *srcpath = n->data, *path;
+
+		path = calloc(1, sizeof(pkgconf_path_t));
+		path->path = strdup(srcpath->path);
+
+#ifdef PKGCONF_CACHE_INODES
+		path->handle_path = srcpath->handle_path;
+		path->handle_device = srcpath->handle_device;
+#endif
+
+		pkgconf_node_insert_tail(&path->lnode, path, dst);
+	}
+}
+
 /*
  * !doc
  *
@@ -211,4 +300,70 @@ pkgconf_path_free(pkgconf_list_t *dirlist)
 		free(pnode->path);
 		free(pnode);
 	}
+
+	pkgconf_list_zero(dirlist);
+}
+
+static char *
+normpath(const char *path)
+{
+	if (!path)
+		return NULL;
+
+	char *copy = strdup(path);
+	if (NULL == copy)
+		return NULL;
+	char *ptr = copy;
+
+	for (int ii = 0; copy[ii]; ii++)
+	{
+		*ptr++ = path[ii];
+		if ('/' == path[ii])
+		{
+			ii++;
+			while ('/' == path[ii])
+				ii++;
+			ii--;
+		}
+	}
+	*ptr = '\0';
+
+	return copy;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
+ *
+ *    Relocates a path, possibly calling normpath() on it.
+ *
+ *    :param char* buf: The path to relocate.
+ *    :param size_t buflen: The buffer length the path is contained in.
+ *    :return: true on success, false on error
+ *    :rtype: bool
+ */
+bool
+pkgconf_path_relocate(char *buf, size_t buflen)
+{
+#ifdef _WIN32
+	char *ti;
+#endif
+
+	char *tmpbuf;
+
+	if ((tmpbuf = normpath(buf)) != NULL)
+	{
+		size_t tmpbuflen = strlen(tmpbuf);
+		if (tmpbuflen > buflen)
+		{
+			free(tmpbuf);
+			return false;
+		}
+
+		pkgconf_strlcpy(buf, tmpbuf, buflen);
+		free(tmpbuf);
+	}
+
+	return true;
 }

libpkgconf/personality.c

@@ -0,0 +1,339 @@
+/*
+ * personality.c
+ * libpkgconf cross-compile personality database
+ *
+ * Copyright (c) 2018 pkgconf authors (see AUTHORS).
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+#include <libpkgconf/config.h>
+#include <libpkgconf/stdinc.h>
+#include <libpkgconf/libpkgconf.h>
+
+/*
+ * !doc
+ *
+ * libpkgconf `personality` module
+ * =========================
+ */
+
+#ifdef _WIN32
+#	define strcasecmp _stricmp
+#endif
+
+/*
+ * Increment each time the default personality is inited, decrement each time
+ * it's deinited. Whenever it is 0, then the deinit frees the personality. In
+ * that case an additional call to init will create it anew.
+ */
+static unsigned default_personality_init = 0;
+
+static pkgconf_cross_personality_t default_personality = {
+	.name = "default",
+#ifdef _WIN32
+	.want_default_static = true,
+	.want_default_pure = true,
+#endif
+};
+
+static inline void
+build_default_search_path(pkgconf_list_t* dirlist)
+{
+#ifdef _WIN32
+	char namebuf[MAX_PATH];
+	char outbuf[MAX_PATH];
+	char *p;
+
+	int sizepath = GetModuleFileName(NULL, namebuf, sizeof namebuf);
+	char * winslash;
+	namebuf[sizepath] = '\0';
+	while ((winslash = strchr (namebuf, '\\')) != NULL)
+	{
+		*winslash = '/';
+	}
+	p = strrchr(namebuf, '/');
+	if (p == NULL)
+		pkgconf_path_split(PKG_DEFAULT_PATH, dirlist, true);
+
+	*p = '\0';
+	pkgconf_strlcpy(outbuf, namebuf, sizeof outbuf);
+	pkgconf_strlcat(outbuf, "/", sizeof outbuf);
+	pkgconf_strlcat(outbuf, "../lib/pkgconfig", sizeof outbuf);
+	pkgconf_path_add(outbuf, dirlist, true);
+	pkgconf_strlcpy(outbuf, namebuf, sizeof outbuf);
+	pkgconf_strlcat(outbuf, "/", sizeof outbuf);
+	pkgconf_strlcat(outbuf, "../share/pkgconfig", sizeof outbuf);
+	pkgconf_path_add(outbuf, dirlist, true);
+#elif __HAIKU__
+	char **paths;
+	size_t count;
+	if (find_paths(B_FIND_PATH_DEVELOP_LIB_DIRECTORY, "pkgconfig", &paths, &count) == B_OK) {
+		for (size_t i = 0; i < count; i++)
+			pkgconf_path_add(paths[i], dirlist, true);
+		free(paths);
+		paths = NULL;
+	}
+	if (find_paths(B_FIND_PATH_DATA_DIRECTORY, "pkgconfig", &paths, &count) == B_OK) {
+		for (size_t i = 0; i < count; i++)
+			pkgconf_path_add(paths[i], dirlist, true);
+		free(paths);
+		paths = NULL;
+	}
+#else
+	pkgconf_path_split(PKG_DEFAULT_PATH, dirlist, true);
+#endif
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: const pkgconf_cross_personality_t *pkgconf_cross_personality_default(void)
+ *
+ *    Returns the default cross-compile personality.
+ *
+ *    Not thread safe.
+ *
+ *    :rtype: pkgconf_cross_personality_t*
+ *    :return: the default cross-compile personality
+ */
+pkgconf_cross_personality_t *
+pkgconf_cross_personality_default(void)
+{
+	if (default_personality_init) {
+		++default_personality_init;
+		return &default_personality;
+	}
+
+	build_default_search_path(&default_personality.dir_list);
+
+	pkgconf_path_split(SYSTEM_LIBDIR, &default_personality.filter_libdirs, false);
+	pkgconf_path_split(SYSTEM_INCLUDEDIR, &default_personality.filter_includedirs, false);
+
+	++default_personality_init;
+	return &default_personality;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *)
+ *
+ *    Decrements the count of default cross personality instances.
+ *
+ *    Not thread safe.
+ *
+ *    :rtype: void
+ */
+void
+pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *personality)
+{
+    if (--default_personality_init == 0) {
+        pkgconf_path_free(&personality->dir_list);
+        pkgconf_path_free(&personality->filter_libdirs);
+        pkgconf_path_free(&personality->filter_includedirs);
+    }
+}
+
+#ifndef PKGCONF_LITE
+static bool
+valid_triplet(const char *triplet)
+{
+	const char *c = triplet;
+
+	for (; *c; c++)
+		if (!isalnum((unsigned char)*c) && *c != '-' && *c != '_')
+			return false;
+
+	return true;
+}
+
+typedef void (*personality_keyword_func_t)(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value);
+typedef struct {
+	const char *keyword;
+	const personality_keyword_func_t func;
+	const ptrdiff_t offset;
+} personality_keyword_pair_t;
+
+static void
+personality_bool_func(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value)
+{
+	(void) keyword;
+	(void) lineno;
+
+	bool *dest = (bool *)((char *) p + offset);
+	*dest = strcasecmp(value, "true") || strcasecmp(value, "yes") || *value == '1';
+}
+
+static void
+personality_copy_func(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value)
+{
+	(void) keyword;
+	(void) lineno;
+
+	char **dest = (char **)((char *) p + offset);
+	*dest = strdup(value);
+}
+
+static void
+personality_fragment_func(pkgconf_cross_personality_t *p, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value)
+{
+	(void) keyword;
+	(void) lineno;
+
+	pkgconf_list_t *dest = (pkgconf_list_t *)((char *) p + offset);
+	pkgconf_path_split(value, dest, false);
+}
+
+/* keep in alphabetical order! */
+static const personality_keyword_pair_t personality_keyword_pairs[] = {
+	{"DefaultSearchPaths", personality_fragment_func, offsetof(pkgconf_cross_personality_t, dir_list)},
+	{"SysrootDir", personality_copy_func, offsetof(pkgconf_cross_personality_t, sysroot_dir)},
+	{"SystemIncludePaths", personality_fragment_func, offsetof(pkgconf_cross_personality_t, filter_includedirs)},
+	{"SystemLibraryPaths", personality_fragment_func, offsetof(pkgconf_cross_personality_t, filter_libdirs)},
+	{"Triplet", personality_copy_func, offsetof(pkgconf_cross_personality_t, name)},
+	{"WantDefaultPure", personality_bool_func, offsetof(pkgconf_cross_personality_t, want_default_pure)},
+	{"WantDefaultStatic", personality_bool_func, offsetof(pkgconf_cross_personality_t, want_default_static)},
+};
+
+static int
+personality_keyword_pair_cmp(const void *key, const void *ptr)
+{
+	const personality_keyword_pair_t *pair = ptr;
+	return strcasecmp(key, pair->keyword);
+}
+
+static void
+personality_keyword_set(pkgconf_cross_personality_t *p, const size_t lineno, const char *keyword, char *value)
+{
+	const personality_keyword_pair_t *pair = bsearch(keyword,
+		personality_keyword_pairs, PKGCONF_ARRAY_SIZE(personality_keyword_pairs),
+		sizeof(personality_keyword_pair_t), personality_keyword_pair_cmp);
+
+	if (pair == NULL || pair->func == NULL)
+		return;
+
+	pair->func(p, keyword, lineno, pair->offset, value);
+}
+
+static const pkgconf_parser_operand_func_t personality_parser_ops[256] = {
+	[':'] = (pkgconf_parser_operand_func_t) personality_keyword_set
+};
+
+static void personality_warn_func(void *p, const char *fmt, ...) PRINTFLIKE(2, 3);
+
+static void
+personality_warn_func(void *p, const char *fmt, ...)
+{
+	va_list va;
+
+	(void) p;
+
+	va_start(va, fmt);
+	vfprintf(stderr, fmt, va);
+	va_end(va);
+}
+
+static pkgconf_cross_personality_t *
+load_personality_with_path(const char *path, const char *triplet, bool datadir)
+{
+	char pathbuf[PKGCONF_ITEM_SIZE];
+	FILE *f;
+	pkgconf_cross_personality_t *p;
+
+	/* if triplet is null, assume that path is a direct path to the personality file */
+	if (triplet == NULL)
+		pkgconf_strlcpy(pathbuf, path, sizeof pathbuf);
+	else if (datadir)
+		snprintf(pathbuf, sizeof pathbuf, "%s/pkgconfig/personality.d/%s.personality", path, triplet);
+	else
+		snprintf(pathbuf, sizeof pathbuf, "%s/%s.personality", path, triplet);
+
+	f = fopen(pathbuf, "r");
+	if (f == NULL)
+		return NULL;
+
+	p = calloc(1, sizeof(pkgconf_cross_personality_t));
+	if (triplet != NULL)
+		p->name = strdup(triplet);
+	pkgconf_parser_parse(f, p, personality_parser_ops, personality_warn_func, pathbuf);
+
+	return p;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: pkgconf_cross_personality_t *pkgconf_cross_personality_find(const char *triplet)
+ *
+ *    Attempts to find a cross-compile personality given a triplet.
+ *
+ *    :rtype: pkgconf_cross_personality_t*
+ *    :return: the default cross-compile personality
+ */
+pkgconf_cross_personality_t *
+pkgconf_cross_personality_find(const char *triplet)
+{
+	pkgconf_list_t plist = PKGCONF_LIST_INITIALIZER;
+	pkgconf_node_t *n;
+	pkgconf_cross_personality_t *out = NULL;
+#if ! defined(_WIN32) && ! defined(__HAIKU__)
+	char pathbuf[PKGCONF_ITEM_SIZE];
+	const char *envvar;
+#endif
+
+	out = load_personality_with_path(triplet, NULL, false);
+	if (out != NULL)
+		return out;
+
+	if (!valid_triplet(triplet))
+		return NULL;
+
+#if ! defined(_WIN32) && ! defined(__HAIKU__)
+	envvar = getenv("XDG_DATA_HOME");
+	if (envvar != NULL)
+		pkgconf_path_add(envvar, &plist, true);
+	else {
+		envvar = getenv("HOME");
+		if (envvar != NULL) {
+			pkgconf_strlcpy(pathbuf, envvar, sizeof pathbuf);
+			pkgconf_strlcat(pathbuf, "/.local/share", sizeof pathbuf);
+			pkgconf_path_add(pathbuf, &plist, true);
+		}
+	}
+
+	pkgconf_path_build_from_environ("XDG_DATA_DIRS", "/usr/local/share" PKG_CONFIG_PATH_SEP_S "/usr/share", &plist, true);
+
+	PKGCONF_FOREACH_LIST_ENTRY(plist.head, n)
+	{
+		pkgconf_path_t *pn = n->data;
+
+		out = load_personality_with_path(pn->path, triplet, true);
+		if (out != NULL)
+			goto finish;
+	}
+	pkgconf_path_free(&plist);
+#endif
+
+	pkgconf_path_split(PERSONALITY_PATH, &plist, true);
+
+	PKGCONF_FOREACH_LIST_ENTRY(plist.head, n)
+	{
+		pkgconf_path_t *pn = n->data;
+
+		out = load_personality_with_path(pn->path, triplet, false);
+		if (out != NULL)
+			goto finish;
+	}
+
+finish:
+	pkgconf_path_free(&plist);
+	return out != NULL ? out : pkgconf_cross_personality_default();
+}
+#endif

libpkgconf/queue.c

@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -28,11 +29,6 @@
  * Using the `queue` module functions is the recommended way of working with dependency graphs.
  */
 
-typedef struct {
-	pkgconf_node_t iter;
-	char *package;
-} pkgconf_queue_t;
-
 /*
  * !doc
  *
@@ -47,7 +43,7 @@ typedef struct {
 void
 pkgconf_queue_push(pkgconf_list_t *list, const char *package)
 {
-	pkgconf_queue_t *pkgq = calloc(sizeof(pkgconf_queue_t), 1);
+	pkgconf_queue_t *pkgq = calloc(1, sizeof(pkgconf_queue_t));
 
 	pkgq->package = strdup(package);
 	pkgconf_node_insert_tail(&pkgq->iter, pkgq, list);
@@ -76,10 +72,10 @@ pkgconf_queue_compile(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_li
 		pkgconf_queue_t *pkgq;
 
 		pkgq = iter->data;
-		pkgconf_dependency_parse(client, world, &world->requires, pkgq->package);
+		pkgconf_dependency_parse(client, world, &world->required, pkgq->package, 0);
 	}
 
-	return (world->requires.head != NULL);
+	return (world->required.head != NULL);
 }
 
 /*
@@ -106,88 +102,301 @@ pkgconf_queue_free(pkgconf_list_t *list)
 	}
 }
 
-static inline unsigned int
-pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list, int maxdepth, unsigned int flags)
+static void
+pkgconf_queue_mark_public(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data)
 {
-	if (!pkgconf_queue_compile(client, world, list))
-		return PKGCONF_PKG_ERRF_DEPGRAPH_BREAK;
+	if (pkg->flags & PKGCONF_PKG_PROPF_VISITED_PRIVATE)
+	{
+		pkgconf_list_t *list = data;
+		pkgconf_node_t *node;
 
-	return pkgconf_pkg_verify_graph(client, world, maxdepth, flags);
+		PKGCONF_FOREACH_LIST_ENTRY(list->head, node)
+		{
+			pkgconf_dependency_t *dep = node->data;
+			if (dep->match == pkg)
+				dep->flags &= ~PKGCONF_PKG_DEPF_PRIVATE;
+		}
+
+		pkg->flags &= ~PKGCONF_PKG_PROPF_VISITED_PRIVATE;
+
+		PKGCONF_TRACE(client, "%s: updated, public", pkg->id);
+	}
+}
+
+static unsigned int
+pkgconf_queue_collect_dependencies_main(pkgconf_client_t *client,
+	pkgconf_pkg_t *root,
+	void *data,
+	int maxdepth);
+
+static inline unsigned int
+pkgconf_queue_collect_dependencies_walk(pkgconf_client_t *client,
+	pkgconf_list_t *deplist,
+	void *data,
+	int depth)
+{
+	unsigned int eflags = PKGCONF_PKG_ERRF_OK;
+	pkgconf_node_t *node;
+	pkgconf_pkg_t *world = data;
+
+	PKGCONF_FOREACH_LIST_ENTRY_REVERSE(deplist->tail, node)
+	{
+		pkgconf_dependency_t *dep = node->data;
+		pkgconf_dependency_t *flattened_dep;
+		pkgconf_pkg_t *pkg = dep->match;
+
+		if (*dep->package == '\0')
+			continue;
+
+		if (pkg == NULL)
+		{
+			PKGCONF_TRACE(client, "WTF: unmatched dependency %p <%s>", dep, dep->package);
+			abort();
+		}
+
+		if (pkg->serial == client->serial)
+			continue;
+
+		if (client->flags & PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE)
+			pkg->flags |= PKGCONF_PKG_PROPF_VISITED_PRIVATE;
+		else
+			pkg->flags &= ~PKGCONF_PKG_PROPF_VISITED_PRIVATE;
+
+		eflags |= pkgconf_queue_collect_dependencies_main(client, pkg, data, depth - 1);
+
+		flattened_dep = pkgconf_dependency_copy(client, dep);
+		pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->required);
+	}
+
+	return eflags;
+}
+
+static unsigned int
+pkgconf_queue_collect_dependencies_main(pkgconf_client_t *client,
+	pkgconf_pkg_t *root,
+	void *data,
+	int maxdepth)
+{
+	unsigned int eflags = PKGCONF_PKG_ERRF_OK;
+
+	if (maxdepth == 0)
+		return eflags;
+
+	/* Short-circuit if we have already visited this node.
+	 */
+	if (root->serial == client->serial)
+		return eflags;
+
+	root->serial = client->serial;
+
+	if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE)
+	{
+		PKGCONF_TRACE(client, "%s: collecting private dependencies, level %d", root->id, maxdepth);
+
+		/* XXX: ugly */
+		const unsigned int saved_flags = client->flags;
+		client->flags |= PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE;
+		eflags = pkgconf_queue_collect_dependencies_walk(client, &root->requires_private, data, maxdepth);
+		client->flags = saved_flags;
+		if (eflags != PKGCONF_PKG_ERRF_OK)
+			return eflags;
+	}
+
+	PKGCONF_TRACE(client, "%s: collecting public dependencies, level %d", root->id, maxdepth);
+
+	eflags = pkgconf_queue_collect_dependencies_walk(client, &root->required, data, maxdepth);
+	if (eflags != PKGCONF_PKG_ERRF_OK)
+		return eflags;
+
+	PKGCONF_TRACE(client, "%s: finished, %s", root->id, (root->flags & PKGCONF_PKG_PROPF_VISITED_PRIVATE) ? "private" : "public");
+
+	return eflags;
+}
+
+static inline unsigned int
+pkgconf_queue_collect_dependencies(pkgconf_client_t *client,
+	pkgconf_pkg_t *root,
+	void *data,
+	int maxdepth)
+{
+	++client->serial;
+	return pkgconf_queue_collect_dependencies_main(client, root, data, maxdepth);
+}
+
+static inline unsigned int
+pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_list_t *list, int maxdepth)
+{
+	unsigned int result;
+	const unsigned int saved_flags = client->flags;
+	pkgconf_pkg_t initial_world = {
+		.id = "user:request",
+		.realname = "virtual world package",
+		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
+	};
+
+	if (!pkgconf_queue_compile(client, &initial_world, list))
+	{
+		pkgconf_solution_free(client, &initial_world);
+		return PKGCONF_PKG_ERRF_DEPGRAPH_BREAK;
+	}
+
+	PKGCONF_TRACE(client, "solving");
+	result = pkgconf_pkg_traverse(client, &initial_world, NULL, NULL, maxdepth, 0);
+	if (result != PKGCONF_PKG_ERRF_OK)
+	{
+		pkgconf_solution_free(client, &initial_world);
+		return result;
+	}
+
+	PKGCONF_TRACE(client, "flattening");
+	result = pkgconf_queue_collect_dependencies(client, &initial_world, world, maxdepth);
+	if (result != PKGCONF_PKG_ERRF_OK)
+	{
+		pkgconf_solution_free(client, &initial_world);
+		return result;
+	}
+
+	if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE)
+	{
+		PKGCONF_TRACE(client, "marking public deps");
+		client->flags &= ~PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
+		client->flags |= PKGCONF_PKG_PKGF_SKIP_CONFLICTS;
+		result = pkgconf_pkg_traverse(client, &initial_world, pkgconf_queue_mark_public, &world->required, maxdepth, 0);
+		client->flags = saved_flags;
+		if (result != PKGCONF_PKG_ERRF_OK)
+		{
+			pkgconf_solution_free(client, &initial_world);
+			return result;
+		}
+	}
+
+	/* free the initial solution */
+	pkgconf_solution_free(client, &initial_world);
+
+	return PKGCONF_PKG_ERRF_OK;
 }
 
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data)
+ * .. c:function:: void pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world, int maxdepth)
+ *
+ *    Removes references to package nodes contained in a solution.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
+ *    :param pkgconf_pkg_t* world: The root for the generated dependency graph.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
+ *    :returns: nothing
+ */
+void
+pkgconf_solution_free(pkgconf_client_t *client, pkgconf_pkg_t *world)
+{
+	(void) client;
+
+	if (world->flags & PKGCONF_PKG_PROPF_VIRTUAL)
+	{
+		pkgconf_dependency_free(&world->required);
+		pkgconf_dependency_free(&world->requires_private);
+	}
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: bool pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
+ *
+ *    Solves and flattens the dependency graph for the supplied dependency list.
+ *
+ *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
+ *    :param pkgconf_list_t* list: The list of dependency requests to consider.
+ *    :param pkgconf_pkg_t* world: The root for the generated dependency graph, provided by the caller.  Should have PKGCONF_PKG_PROPF_VIRTUAL flag.
+ *    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
+ *    :returns: true if the dependency resolver found a solution, otherwise false.
+ *    :rtype: bool
+ */
+bool
+pkgconf_queue_solve(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_pkg_t *world, int maxdepth)
+{
+	/* if maxdepth is one, then we will not traverse deeper than our virtual package. */
+	if (!maxdepth)
+		maxdepth = -1;
+
+	return pkgconf_queue_verify(client, world, list, maxdepth) == PKGCONF_PKG_ERRF_OK;
+}
+
+/*
+ * !doc
+ *
+ * .. c:function:: void pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
  *
  *    Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem and
  *    feed the solution to a callback function if a complete dependency graph is found.
  *
+ *    This function should not be used in new code.  Use pkgconf_queue_solve instead.
+ *
  *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
  *    :param pkgconf_list_t* list: The list of dependency requests to consider.
  *    :param pkgconf_queue_apply_func_t func: The callback function to call if a solution is found by the dependency resolver.
  *    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
- *    :param uint flags: A bitfield of flags that is passed to the dependency resolver, optionally modifying it's behaviour.
  *    :param void* data: An opaque pointer which is passed to the callback function.
  *    :returns: true if the dependency resolver found a solution, otherwise false.
  *    :rtype: bool
  */
 bool
-pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data)
+pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
 {
+	bool ret = false;
 	pkgconf_pkg_t world = {
 		.id = "virtual:world",
 		.realname = "virtual world package",
-		.flags = PKGCONF_PKG_PROPF_VIRTUAL,
+		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
 	};
 
 	/* if maxdepth is one, then we will not traverse deeper than our virtual package. */
 	if (!maxdepth)
 		maxdepth = -1;
 
-	if (pkgconf_queue_verify(client, &world, list, maxdepth, flags) != PKGCONF_PKG_ERRF_OK)
-		return false;
+	if (!pkgconf_queue_solve(client, list, &world, maxdepth))
+		goto cleanup;
 
-	if (!func(client, &world, data, maxdepth, flags))
-	{
-		pkgconf_pkg_free(client, &world);
-		return false;
-	}
+	/* the world dependency set is flattened after it is returned from pkgconf_queue_verify */
+	if (!func(client, &world, data, maxdepth))
+		goto cleanup;
 
+	ret = true;
+
+cleanup:
 	pkgconf_pkg_free(client, &world);
-
-	return true;
+	return ret;
 }
 
 /*
  * !doc
  *
- * .. c:function:: void pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, unsigned int flags, void *data)
+ * .. c:function:: void pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queue_apply_func_t func, int maxdepth, void *data)
  *
  *    Attempt to compile a dependency resolution queue into a dependency resolution problem, then attempt to solve the problem.
  *
  *    :param pkgconf_client_t* client: The pkgconf client object to use for dependency resolution.
  *    :param pkgconf_list_t* list: The list of dependency requests to consider.
  *    :param int maxdepth: The maximum allowed depth for the dependency resolver.  A depth of -1 means unlimited.
- *    :param uint flags: A bitfield of flags that is passed to the dependency resolver, optionally modifying it's behaviour.
  *    :returns: true if the dependency resolver found a solution, otherwise false.
  *    :rtype: bool
  */
 bool
-pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, int maxdepth, unsigned int flags)
+pkgconf_queue_validate(pkgconf_client_t *client, pkgconf_list_t *list, int maxdepth)
 {
 	bool retval = true;
 	pkgconf_pkg_t world = {
 		.id = "virtual:world",
 		.realname = "virtual world package",
-		.flags = PKGCONF_PKG_PROPF_VIRTUAL,
+		.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
 	};
 
 	/* if maxdepth is one, then we will not traverse deeper than our virtual package. */
 	if (!maxdepth)
 		maxdepth = -1;
 
-	if (pkgconf_queue_verify(client, &world, list, maxdepth, flags) != PKGCONF_PKG_ERRF_OK)
+	if (pkgconf_queue_verify(client, &world, list, maxdepth) != PKGCONF_PKG_ERRF_OK)
 		retval = false;
 
 	pkgconf_pkg_free(client, &world);

libpkgconf/stdinc.h

@@ -13,10 +13,9 @@
  * from the use of this software.
  */
 
-#ifndef __STDINC_H
-#define __STDINC_H
+#ifndef LIBPKGCONF_STDINC_H
+#define LIBPKGCONF_STDINC_H
 
-#define _GNU_SOURCE
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,10 +23,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include <string.h>
-#include <dirent.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <stdint.h>
 
 #ifdef _WIN32
@@ -35,8 +31,40 @@
 # include <windows.h>
 # include <malloc.h>
 # define PATH_DEV_NULL	"nul"
+# ifdef _WIN64
+#  define SIZE_FMT_SPECIFIER	"%I64u"
+# else
+#  define SIZE_FMT_SPECIFIER	"%u"
+# endif
+# ifndef ssize_t
+# ifndef __MINGW32__
+#  include <BaseTsd.h>
+# else
+#  include <basetsd.h>
+# endif
+#  define ssize_t SSIZE_T
+# endif
+# ifndef __MINGW32__
+#  include "win-dirent.h"
+# else
+# include <dirent.h>
+# endif
+# define PKGCONF_ITEM_SIZE (_MAX_PATH + 1024)
 #else
 # define PATH_DEV_NULL	"/dev/null"
+# define SIZE_FMT_SPECIFIER	"%zu"
+# ifdef __HAIKU__
+#  include <FindDirectory.h>
+# endif
+# include <dirent.h>
+# include <unistd.h>
+# include <limits.h>
+# include <strings.h>
+# ifdef PATH_MAX
+#  define PKGCONF_ITEM_SIZE (PATH_MAX + 1024)
+# else
+#  define PKGCONF_ITEM_SIZE (4096 + 1024)
+# endif
 #endif
 
 #endif

libpkgconf/tuple.c

@@ -13,6 +13,7 @@
  * from the use of this software.
  */
 
+#include <libpkgconf/stdinc.h>
 #include <libpkgconf/libpkgconf.h>
 
 /*
@@ -44,7 +45,23 @@
 void
 pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *value)
 {
-	pkgconf_tuple_add(client, &client->global_vars, key, value, false);
+	pkgconf_tuple_add(client, &client->global_vars, key, value, false, 0);
+}
+
+static pkgconf_tuple_t *
+lookup_global_tuple(const pkgconf_client_t *client, const char *key)
+{
+	pkgconf_node_t *node;
+
+	PKGCONF_FOREACH_LIST_ENTRY(client->global_vars.head, node)
+	{
+		pkgconf_tuple_t *tuple = node->data;
+
+		if (!strcmp(tuple->key, key))
+			return tuple;
+	}
+
+	return NULL;
 }
 
 /*
@@ -62,17 +79,13 @@ pkgconf_tuple_add_global(pkgconf_client_t *client, const char *key, const char *
 char *
 pkgconf_tuple_find_global(const pkgconf_client_t *client, const char *key)
 {
-	pkgconf_node_t *node;
+	pkgconf_tuple_t *tuple;
 
-	PKGCONF_FOREACH_LIST_ENTRY(client->global_vars.head, node)
-	{
-		pkgconf_tuple_t *tuple = node->data;
+	tuple = lookup_global_tuple(client, key);
+	if (tuple == NULL)
+		return NULL;
 
-		if (!strcmp(tuple->key, key))
-			return tuple->value;
-	}
-
-	return NULL;
+	return tuple->value;
 }
 
 /*
@@ -107,13 +120,18 @@ pkgconf_tuple_define_global(pkgconf_client_t *client, const char *kv)
 {
 	char *workbuf = strdup(kv);
 	char *value;
+	pkgconf_tuple_t *tuple;
 
 	value = strchr(workbuf, '=');
 	if (value == NULL)
 		goto out;
 
 	*value++ = '\0';
-	pkgconf_tuple_add_global(client, workbuf, value);
+
+	tuple = pkgconf_tuple_add(client, &client->global_vars, workbuf, value, false, 0);
+	if (tuple != NULL)
+		tuple->flags = PKGCONF_PKG_TUPLEF_OVERRIDE;
+
 out:
 	free(workbuf);
 }
@@ -135,6 +153,70 @@ pkgconf_tuple_find_delete(pkgconf_list_t *list, const char *key)
 	}
 }
 
+static char *
+dequote(const char *value)
+{
+	char *buf = calloc(1, (strlen(value) + 1) * 2);
+	char *bptr = buf;
+	const char *i;
+	char quote = 0;
+
+	if (*value == '\'' || *value == '"')
+		quote = *value;
+
+	for (i = value; *i != '\0'; i++)
+	{
+		if (*i == '\\' && quote && *(i + 1) == quote)
+		{
+			i++;
+			*bptr++ = *i;
+		}
+		else if (*i != quote)
+			*bptr++ = *i;
+	}
+
+	return buf;
+}
+
+static const char *
+find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars)
+{
+	const char *sysroot_dir;
+
+	sysroot_dir = pkgconf_tuple_find(client, vars, "pc_sysrootdir");
+	if (sysroot_dir == NULL)
+		sysroot_dir = client->sysroot_dir;
+
+	return sysroot_dir;
+}
+
+static bool
+should_rewrite_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *buf, unsigned int flags)
+{
+	const char *sysroot_dir;
+
+	if (flags & PKGCONF_PKG_PROPF_UNINSTALLED && !(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES))
+		return false;
+
+	sysroot_dir = find_sysroot(client, vars);
+	if (sysroot_dir == NULL)
+		return false;
+
+	if (*buf != '/')
+		return false;
+
+	if (!strcmp(sysroot_dir, "/"))
+		return false;
+
+	if (strlen(buf) <= strlen(sysroot_dir))
+		return false;
+
+	if (strstr(buf + strlen(sysroot_dir), sysroot_dir) == NULL)
+		return false;
+
+	return true;
+}
+
 /*
  * !doc
  *
@@ -151,20 +233,27 @@ pkgconf_tuple_find_delete(pkgconf_list_t *list, const char *key)
  *    :rtype: pkgconf_tuple_t *
  */
 pkgconf_tuple_t *
-pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key, const char *value, bool parse)
+pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key, const char *value, bool parse, unsigned int flags)
 {
-	pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1);
+	char *dequote_value;
+	pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t));
 
 	pkgconf_tuple_find_delete(list, key);
 
+	dequote_value = dequote(value);
+
 	tuple->key = strdup(key);
 	if (parse)
-		tuple->value = pkgconf_tuple_parse(client, list, value);
+		tuple->value = pkgconf_tuple_parse(client, list, dequote_value, flags);
 	else
-		tuple->value = strdup(value);
+		tuple->value = strdup(dequote_value);
+
+	PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, tuple->value, parse);
 
 	pkgconf_node_insert(&tuple->iter, tuple, list);
 
+	free(dequote_value);
+
 	return tuple;
 }
 
@@ -185,10 +274,11 @@ char *
 pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key)
 {
 	pkgconf_node_t *node;
-	char *res;
+	pkgconf_tuple_t *global_tuple;
 
-	if ((res = pkgconf_tuple_find_global(client, key)) != NULL)
-		return res;
+	global_tuple = lookup_global_tuple(client, key);
+	if (global_tuple != NULL && global_tuple->flags & PKGCONF_PKG_TUPLEF_OVERRIDE)
+		return global_tuple->value;
 
 	PKGCONF_FOREACH_LIST_ENTRY(list->head, node)
 	{
@@ -198,31 +288,39 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
 			return tuple->value;
 	}
 
+	if (global_tuple != NULL)
+		return global_tuple->value;
+
 	return NULL;
 }
 
 /*
  * !doc
  *
- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
+ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
  *
  *    Parse an expression for variable substitution.
  *
  *    :param pkgconf_client_t* client: The pkgconf client object to access.
  *    :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
  *    :param char* value: The ``key=value`` string to parse.
+ *    :param uint flags: Any flags to consider while parsing.
  *    :return: the variable data with any variables substituted
  *    :rtype: char *
  */
 char *
-pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
+pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags)
 {
 	char buf[PKGCONF_BUFSIZE];
 	const char *ptr;
 	char *bptr = buf;
 
-	if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir)))
-		bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
+	if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) &&
+		(!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES)))
+	{
+		if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir)))
+			bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
+	}
 
 	for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++)
 	{
@@ -230,7 +328,8 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 			*bptr++ = *ptr;
 		else if (*(ptr + 1) == '{')
 		{
-			static char varname[PKGCONF_BUFSIZE];
+			char varname[PKGCONF_ITEM_SIZE];
+			char *vend = varname + PKGCONF_ITEM_SIZE - 1;
 			char *vptr = varname;
 			const char *pptr;
 			char *kv, *parsekv;
@@ -240,7 +339,15 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 			for (pptr = ptr + 2; *pptr != '\0'; pptr++)
 			{
 				if (*pptr != '}')
-					*vptr++ = *pptr;
+				{
+					if (vptr < vend)
+						*vptr++ = *pptr;
+					else
+					{
+						*vptr = '\0';
+						break;
+					}
+				}
 				else
 				{
 					*vptr = '\0';
@@ -248,12 +355,23 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 				}
 			}
 
+			PKGCONF_TRACE(client, "lookup tuple %s", varname);
+
+			size_t remain = PKGCONF_BUFSIZE - (bptr - buf);
 			ptr += (pptr - ptr);
 			kv = pkgconf_tuple_find_global(client, varname);
 			if (kv != NULL)
 			{
-				strncpy(bptr, kv, PKGCONF_BUFSIZE - (bptr - buf));
-				bptr += strlen(kv);
+				size_t nlen = pkgconf_strlcpy(bptr, kv, remain);
+				if (nlen > remain)
+				{
+					pkgconf_warn(client, "warning: truncating very long variable to 64KB\n");
+
+					bptr = buf + (PKGCONF_BUFSIZE - 1);
+					break;
+				}
+
+				bptr += nlen;
 			}
 			else
 			{
@@ -261,12 +379,21 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 
 				if (kv != NULL)
 				{
-					parsekv = pkgconf_tuple_parse(client, vars, kv);
-
-					strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf));
-					bptr += strlen(parsekv);
+					size_t nlen;
 
+					parsekv = pkgconf_tuple_parse(client, vars, kv, flags);
+					nlen = pkgconf_strlcpy(bptr, parsekv, remain);
 					free(parsekv);
+
+					if (nlen > remain)
+					{
+						pkgconf_warn(client, "warning: truncating very long variable to 64KB\n");
+
+						bptr = buf + (PKGCONF_BUFSIZE - 1);
+						break;
+					}
+
+					bptr += nlen;
 				}
 			}
 		}
@@ -274,6 +401,34 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
 
 	*bptr = '\0';
 
+	/*
+	 * Sigh.  Somebody actually attempted to use freedesktop.org pkg-config's broken sysroot support,
+	 * which was written by somebody who did not understand how sysroots are supposed to work.  This
+	 * results in an incorrect path being built as the sysroot will be prepended twice, once explicitly,
+	 * and once by variable expansion (the pkgconf approach).  We could simply make ${pc_sysrootdir} blank,
+	 * but sometimes it is necessary to know the explicit sysroot path for other reasons, so we can't really
+	 * do that.
+	 *
+	 * As a result, we check to see if ${pc_sysrootdir} is prepended as a duplicate, and if so, remove the
+	 * prepend.  This allows us to handle both our approach and the broken freedesktop.org implementation's
+	 * approach.  Because a path can be shorter than ${pc_sysrootdir}, we do some checks first to ensure it's
+	 * safe to skip ahead in the string to scan for our sysroot dir.
+	 *
+	 * Finally, we call pkgconf_path_relocate() to clean the path of spurious elements.
+	 *
+	 * New in 1.9: Only attempt to rewrite the sysroot if we are not processing an uninstalled package.
+	 */
+	if (should_rewrite_sysroot(client, vars, buf, flags))
+	{
+		char cleanpath[PKGCONF_ITEM_SIZE];
+		const char *sysroot_dir = find_sysroot(client, vars);
+
+		pkgconf_strlcpy(cleanpath, buf + strlen(sysroot_dir), sizeof cleanpath);
+		pkgconf_path_relocate(cleanpath, sizeof cleanpath);
+
+		return strdup(cleanpath);
+	}
+
 	return strdup(buf);
 }
 
@@ -316,4 +471,6 @@ pkgconf_tuple_free(pkgconf_list_t *list)
 
 	PKGCONF_FOREACH_LIST_ENTRY_SAFE(list->head, next, node)
 		pkgconf_tuple_free_entry(node->data, list);
+
+	pkgconf_list_zero(list);
 }

m4/ax_check_compile_flag.m4

@@ -0,0 +1,53 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS

man/pc.5

@@ -0,0 +1,178 @@
+.\" Copyright (c) 2017 pkgconf authors (see AUTHORS).
+.\"
+.\" Permission to use, copy, modify, and/or distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" This software is provided 'as is' and without any warranty, express or
+.\" implied.  In no event shall the authors be liable for any damages arising
+.\" from the use of this software.
+.Dd December 15, 2017
+.Dt PC 5
+.Os
+.Sh NAME
+.Nm file.pc
+.Nd pkg-config file format
+.Sh DESCRIPTION
+pkg-config files provide a useful mechanism for storing various information
+about libraries and packages on a given system.
+Information stored by
+.Nm .pc
+files include compiler and linker flags necessary to use a given library, as
+well as any other relevant metadata.
+.Pp
+These
+.Nm .pc
+files are processed by a utility called
+.Nm pkg-config ,
+of which
+.Nm pkgconf
+is an implementation.
+.\"
+.Ss FILE SYNTAX
+The
+.Nm .pc
+file follows a format inspired by RFC822.
+Comments are prefixed by a pound sign, hash sign or octothorpe (#), and variable
+assignment is similar to POSIX shell.
+Properties are defined using RFC822-style stanzas.
+.\"
+.Ss VARIABLES
+.\"
+Variable definitions start with an alphanumeric string, followed by an equal sign,
+and then the value the variable should contain.
+.Pp
+Variable references are always written as "${variable}".
+It is possible to escape literal "${" as "$${".
+.\"
+.Ss PROPERTIES
+.\"
+Properties are set using RFC822-style stanzas which consist of a keyword, followed
+by a colon (:) and then the value the property should be set to.
+Variable substitution is always performed regardless of property type.
+.Pp
+There are three types of property:
+.\"
+.Bl -tag -width indent
+.\"
+.It Literal
+The property will be set to the text of the value.
+.\"
+.It Dependency List
+The property will be set to a list of dependencies parsed from the
+text.
+Dependency lists are defined by this ABNF syntax:
+.Bd -literal
+package-list = *WSP *( package-spec *( package-sep ) )
+package-sep  = WSP / ","
+.\"
+package-spec = package-key [ ver-op package-version ]
+ver-op       = "<" / "<=" / "=" / "!=" / ">=" / ">"
+.Ed
+.\"
+.It Fragment List
+The property will be set to a list of fragments parsed from the text.
+The input text must be in a format that is suitable for passing to a POSIX
+shell without any shell expansions after variable substitution has been done.
+.\"
+.El
+.Ss PROPERTY KEYWORDS
+.Bl -tag -width indent
+.\"
+.It Name
+The displayed name of the package.
+(mandatory; literal)
+.It Version
+The version of the package.
+(mandatory; literal)
+.It Description
+A description of the package.
+(mandatory; literal)
+.It URL
+A URL to a webpage for the package.
+This is used to recommend where newer versions of the package can be acquired.
+(mandatory; literal)
+.It Cflags
+Required compiler flags.
+These flags are always used, regardless of whether static compilation is requested.
+(optional; fragment list)
+.It Cflags.private
+Required compiler flags for static compilation.
+(optional; fragment list; pkgconf extension)
+.It Copyright
+A copyright attestation statement.
+(optional; literal; pkgconf extension)
+.It Libs
+Required linking flags for this package.
+Libraries this package depends on for linking against it, which are not
+described as dependencies should be specified here.
+(optional; fragment list)
+.It Libs.private
+Required linking flags for this package that are only required when linking
+statically.
+Libraries this package depends on for linking against it statically, which are
+not described as dependencies should be specified here.
+(optional; fragment list)
+.It License
+The asserted SPDX license tag that should be applied to the given package.
+(optional; literal; pkgconf extension)
+.It Maintainer
+The preferred contact for the maintainer.  This should be in the format of a
+name followed by an e-mail address or website.
+(optional; literal; pkgconf extension)
+.It Requires
+Required dependencies that must be met for the package to be usable.
+All dependencies must be satisfied or the pkg-config implementation must not use
+the package.
+(optional; dependency list)
+.It Requires.private
+Required dependencies that must be met for the package to be usable for header
+inclusion and static linking.
+All dependencies must be satisfied or the pkg-config implementation must not use
+the package for header inclusion and static linking.
+(optional; dependency list)
+.It Conflicts
+Dependencies that must not be met for the package to be usable.
+If any package in the proposed dependency solution match any dependency in the
+Conflicts list, the package being considered is not usable.
+(optional; dependency list)
+.It Provides
+Dependencies that may be provided by an alternate package.
+If a package cannot be found, the entire package collection is scanned for
+providers which can match the requested dependency.
+(optional; dependency list; pkgconf extension)
+.El
+.Ss EXTENSIONS
+Features that have been marked as a pkgconf extension are only guaranteed to work
+with the pkgconf implementation of pkg-config.
+Other implementations may or may not support the extensions.
+.Pp
+Accordingly, it is suggested that
+.Nm .pc
+files which absolutely depend on these extensions declare a requirement on the
+pkgconf virtual.
+.Sh EXAMPLES
+An example .pc file:
+.Bd -literal
+# This is a comment
+prefix=/home/kaniini/pkg   # this defines a variable
+exec_prefix=${prefix}      # defining another variable with a substitution
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libfoo                                  # human-readable name
+Description: an example library called libfoo # human-readable description
+Copyright: Copyright (c) 2022 pkgconf project authors
+License: Apache-2.0
+Maintainer: the pkgconf project <http://www.pkgconf.org>
+Version: 1.0
+URL: http://www.pkgconf.org
+Requires: libbar > 2.0.0
+Conflicts: libbaz <= 3.0.0
+Libs: -L${libdir} -lfoo
+Libs.private: -lm
+Cflags: -I${includedir}/libfoo
+.Ed
+.Sh SEE ALSO
+.Xr pkgconf 1 ,
+.Xr pkg.m4 7

man/pkg.m4.7

@@ -0,0 +1,143 @@
+.\" Copyright (c) 2017 pkgconf authors (see AUTHORS).
+.\"
+.\" Permission to use, copy, modify, and/or distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" This software is provided 'as is' and without any warranty, express or
+.\" implied.  In no event shall the authors be liable for any damages arising
+.\" from the use of this software.
+.Dd December 5, 2017
+.Dt PKG.M4 7
+.Os
+.Sh NAME
+.Nm pkg.m4
+.Nd autoconf macros for using pkgconf
+.Sh SYNOPSIS
+.Nm PKG_PREREQ
+.Nm PKG_PROG_PKG_CONFIG
+.Nm PKG_CHECK_MODULES
+.Nm PKG_CHECK_MODULES_STATIC
+.Nm PKG_INSTALLDIR
+.Nm PKG_NOARCH_INSTALLDIR
+.Nm PKG_CHECK_VAR
+.Nm PKG_WITH_MODULES
+.Nm PKG_HAVE_WITH_MODULES
+.Nm PKG_HAVE_DEFINE_WITH_MODULES
+.Sh DESCRIPTION
+.Nm
+is a collection of autoconf macros which help to configure compiler and linker
+flags for development libraries.
+This allows build systems to detect other dependencies and use them with the
+system toolchain.
+.Sh "AUTOCONF MACROS"
+.Ss "PKG_PREREQ(MIN-VERSION)"
+Checks that the version of the
+.Nm
+autoconf macros in use is at least MIN-VERSION.
+This can be used to ensure a particular
+.Nm
+macro will be available.
+.Ss "PKG_PROG_PKG_CONFIG([MIN-VERSION])"
+Checks for an implementation of
+.Nm pkg-config
+which is at least MIN-VERSION or newer.
+.Ss "PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])"
+.Ss "PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])"
+Checks whether a given module set exists, and if so, defines
+.Nm CFLAGS
+and
+.Nm LIBS
+variables prefixed by
+.Nm VARIABLE-PREFIX
+with the output from
+.Fl -cflags
+and
+.Fl -libs
+respectively.
+.Pp
+The optional
+.Nm ACTION-IF-FOUND
+and
+.Nm ACTION-IF-NOT-FOUND
+arguments are shell fragments that should be executed if the module set is
+found or not found.
+.Pp
+If
+.Nm $PKG_CONFIG
+is not defined, the
+.Nm PKG_PROG_PKG_CONFIG
+macro will be executed to locate a
+.Nm pkg-config
+implementation.
+.Pp
+The
+.Nm PKG_CHECK_MODULES_STATIC
+macro provides the same behaviour as
+.Nm PKG_CHECK_MODULES
+with static linking enabled via the
+.Fl -static
+flag.
+.Ss "PKG_INSTALLDIR(DIRECTORY)"
+Defines the variable $pkgconfigdir as the location where a package
+should install pkg-config .pc files.
+.Pp
+By default the directory is $libdir/pkgconfig, but the default can
+be changed by passing the
+.Nm DIRECTORY
+parameter.
+.Pp
+This value can be overridden with the
+.Fl -with-pkgconfigdir
+configure parameter.
+.Ss "PKG_NOARCH_INSTALLDIR(DIRECTORY)"
+Defines the variable $noarch_pkgconfigdir as the location where a package
+should install pkg-config .pc files.
+.Pp
+By default the directory is $datadir/pkgconfig, but the default can
+be changed by passing the
+.Nm DIRECTORY
+parameter.
+.Pp
+This value can be overridden with the
+.Fl -with-noarch-pkgconfigdir
+configure parameter.
+.Ss "PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])"
+Retrieves the value of the
+.Nm pkg-config
+variable
+.Nm CONFIG-VARIABLE
+from
+.Nm MODULE
+and stores it in the
+.Nm VARIABLE
+variable.
+.Pp
+Note that repeated usage of
+.Nm VARIABLE
+is not recommended as the check will be skipped if the variable is
+already set.
+.Ss "PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], [DESCRIPTION], [DEFAULT])"
+Prepares a "--with-" configure option using the lowercase
+.Nm VARIABLE-PREFIX
+name, merging the behaviour of
+.Nm AC_ARG_WITH
+and
+.Nm PKG_CHECK_MODULES
+in a single macro.
+.Ss "PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, [DESCRIPTION], [DEFAULT])"
+Convenience macro to trigger
+.Nm AM_CONDITIONAL
+after a
+.Nm PKG_WITH_MODULES check.\&
+.Nm VARIABLE-PREFIX
+is exported as a make variable.
+.Ss "PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, [DESCRIPTION], [DEFAULT])"
+Convenience macro to trigger
+.Nm AM_CONDITIONAL
+and
+.Nm AC_DEFINE
+after a
+.Nm PKG_WITH_MODULES check.\&
+.Nm VARIABLE-PREFIX
+is exported as a make variable.

man/pkgconf-personality.5

@@ -0,0 +1,100 @@
+.\" Copyright (c) 2018 pkgconf authors (see AUTHORS).
+.\"
+.\" Permission to use, copy, modify, and/or distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" This software is provided 'as is' and without any warranty, express or
+.\" implied.  In no event shall the authors be liable for any damages arising
+.\" from the use of this software.
+.Dd July 19, 2018
+.Dt PKGCONF-PERSONALITY 5
+.Os
+.Sh NAME
+.Nm file.personality
+.Nd pkgconf cross-compile personality file format
+.Sh DESCRIPTION
+pkgconf cross-compile personality files provide a useful mechanism for storing
+various information about system toolchains.
+Information stored by
+.Nm .personality
+files include information about paths used by a cross-compile toolchain, such as
+the sysroot directory and default include and library paths.  pkgconf uses this
+information to determine what information is necessary to use libraries.
+.\"
+.Ss FILE SYNTAX
+The
+.Nm .personality
+file follows a format inspired by RFC822.
+Comments are prefixed by a pound sign, hash sign or octothorpe (#), and variable
+assignment is similar to POSIX shell.
+Properties are defined using RFC822-style stanzas.
+.\"
+.Ss PROPERTIES
+.\"
+Properties are set using RFC822-style stanzas which consist of a keyword, followed
+by a colon (:) and then the value the property should be set to.
+Variable substitution is always performed regardless of property type.
+.Pp
+There are three types of property:
+.\"
+.Bl -tag -width indent
+.\"
+.It Literal
+The property will be set to the text of the value.
+.\"
+.It Fragment List
+The property will be set to a list of fragments parsed from the text.
+The input text must be in a format that is suitable for passing to a POSIX
+shell without any shell expansions after variable substitution has been done.
+Elements are delimited with a colon.
+.\"
+.It Boolean
+The property will be set to true if the value is one of: true, yes or 1.
+Otherwise it will be set to false.
+.\"
+.El
+.Ss PROPERTY KEYWORDS
+.Bl -tag -width indent
+.\"
+.It Triplet
+The triplet used by the cross-compile toolchain.
+(mandatory; literal)
+.It SysrootDir
+The directory used by the system root of the cross-compile toolchain.
+(mandatory; literal)
+.It DefaultSearchPaths
+A list of directories to look for
+.Xr pc 5
+files in.
+(mandatory; fragment list)
+.It SystemIncludePaths
+A list of directories that are included by default in the search path for
+include files.
+(mandatory; fragment list)
+.It SystemLibraryPaths
+A list of directories that are included by default in the search path for
+libraries.
+(mandatory; fragment list)
+.It WantDefaultPure
+If true, pkgconf will default to preferring a pure dependency graph.
+(optional; boolean; default is false)
+.It WantDefaultStatic
+If true, pkgconf will default to operating in static linking mode.
+(optional; boolean; default is false)
+.\"
+.El
+.Sh EXAMPLES
+An example .personality file:
+.Bd -literal
+# This is a comment
+Triplet: x86_64-pc-linux-gnu
+SysrootDir: /home/kaniini/sysroot/x86_64-pc-linux-gnu
+DefaultSearchPaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/lib/pkgconfig:/home/kaniini/sysroot/x86_64-pc-linux-gnu/share/pkgconfig
+SystemIncludePaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/include
+SystemLibraryPaths: /home/kaniini/sysroot/x86_64-pc-linux-gnu/lib
+.Ed
+.Sh SEE ALSO
+.Xr pkgconf 1 ,
+.Xr pc 5 ,
+.Xr pkg.m4 7

man/pkgconf.1

@@ -20,8 +20,9 @@
 .Sh DESCRIPTION
 .Nm
 is a program which helps to configure compiler and linker flags for
-development frameworks. This allows build systems to detect other dependencies
-and use them with the system toolchain.
+development libraries.
+This allows build systems to detect other dependencies and use them with the
+system toolchain.
 .Sh GENERAL OPTIONS
 .Bl -tag -width indent
 .It Fl -version
@@ -39,32 +40,61 @@ environmental variable and display information on packages which have registered
 information there.
 .It Fl -simulate
 Simulates resolving a dependency graph based on the requested modules on the
-command line. Dumps a series of trees denoting pkgconf's resolver state.
+command line.
+Dumps a series of trees denoting pkgconf's resolver state.
 .It Fl -no-cache
-Skip caching packages when they are loaded into the internal resolver.  This may
-result in an alternate dependency graph being computed.
+Skip caching packages when they are loaded into the internal resolver.
+This may result in an alternate dependency graph being computed.
 .It Fl -ignore-conflicts
 Ignore
 .Sq Conflicts
 rules in modules.
 .It Fl -env-only
 Learn about pkgconf's configuration strictly from environmental variables.
+.It Fl -validate Ar package ...
+Validate specific
+.Sq .pc
+files for correctness.
 .It Fl -maximum-traverse-depth Ns = Ns Ar DEPTH
-Impose a limit on the allowed depth in the dependency graph.  For example, a
-depth of 2 will restrict the resolver from acting on child dependencies of
-modules added to the resolver's solution.
+Impose a limit on the allowed depth in the dependency graph.
+For example, a depth of 2 will restrict the resolver from acting on child
+dependencies of modules added to the resolver's solution.
 .It Fl -static
 Compute a deeper dependency graph and use compiler/linker flags intended for
 static linking.
+.It Fl -shared
+Compute a simple dependency graph that is only suitable for shared linking.
 .It Fl -pure
-Treats the computed dependency graph as if it were pure. This is mainly intended
-for use with the
+Treats the computed dependency graph as if it were pure.
+This is mainly intended for use with the
 .Fl -static
 flag.
 .It Fl -no-provides
 Ignore
 .Sq Provides
 rules in modules when resolving dependencies.
+.It Fl -with-path Ns = Ns Ar PATH
+Adds a new module search path to pkgconf's dependency resolver.
+Paths added in this way are given preference before other paths.
+.It Fl -define-prefix
+Attempts to determine the prefix variable to use for CFLAGS and LIBS entry relocations.
+This is mainly useful for platforms where framework SDKs are relocatable, such as Windows.
+.It Fl -dont-define-prefix
+Disables the
+.Sq define-prefix
+feature.
+.It Fl -prefix-variable Ns = Ns Ar VARIABLE
+Sets the
+.Sq prefix
+variable used by the
+.Sq define-prefix
+feature.
+.It Fl -relocate Ns = Ns Ar PATH
+Relocates a path using the pkgconf_path_relocate API.
+This is mainly used by the testsuite to provide a guaranteed interface
+to the system's path relocation backend.
+.It Fl -dont-relocate-paths
+Disables the path relocation feature.
 .El
 .Sh MODULE-SPECIFIC OPTIONS
 .Bl -tag -width indent
@@ -75,24 +105,24 @@ Exit with error if a module's version is not exactly the specified version.
 .It Fl -max-version Ns = Ns Ar VERSION
 Exit with error if a module's version is greater than the specified version.
 .It Fl -exists
-Exit with a non-zero result if the dependency resolver was able to find all of
+Exit with a non-zero result if the dependency resolver was unable to find all of
 the requested modules.
 .It Fl -uninstalled
 Exit with a non-zero result if the dependency resolver uses an
 .Sq uninstalled
-module as part of it's solution.
+module as part of its solution.
 .It Fl -no-uninstalled
 Forbids the dependency resolver from considering 'uninstalled' modules as part
 of a solution.
 .El
 .Sh QUERY-SPECIFIC OPTIONS
 .Bl -tag -width indent
-.It Fl -cflags Ns , Fl -cflags-only-I Ns , Fl -cflags-only-other
+.It Fl -cflags , Fl -cflags-only-I , Fl -cflags-only-other
 Display either all CFLAGS, only
 .Fl I
 CFLAGS or only CFLAGS that are not
 .Fl I .
-.It Fl -libs Ns , Fl -libs-only-L Ns , Fl -libs-only-l Ns , Fl -libs-only-other
+.It Fl -libs , Fl -libs-only-L , Fl -libs-only-l , Fl -libs-only-other
 Display either all linker flags, only
 .Fl L
 linker flags, only
@@ -101,7 +131,7 @@ linker flags or only linker flags that are not
 .Fl L
 or
 .Fl l .
-.It Fl -keep-system-cflags Ns , Fl -keep-system-libs
+.It Fl -keep-system-cflags , Fl -keep-system-libs
 Keep CFLAGS or linker flag fragments that would be filtered due to being
 included by default in the compiler.
 .It Fl -define-variable Ns = Ns Ar VARNAME Ns = Ns Ar VALUE
@@ -120,7 +150,7 @@ entries for a module to the output channel.
 .It Fl -variable Ns = Ns Ar VARNAME
 Print the value of
 .Va VARNAME .
-.It Fl -print-requires Ns , Fl -print-requires-private
+.It Fl -print-requires , Fl -print-requires-private
 Print the modules included in either the
 .Va Requires
 field or the
@@ -129,7 +159,20 @@ field.
 .It Fl -digraph
 Dump the dependency resolver's solution as a graphviz
 .Sq dot
-file. This can be used with graphviz to visualize module interdependencies.
+file.
+This can be used with graphviz to visualize module interdependencies.
+.It Fl -path
+Display the filenames of the
+.Sq .pc
+files used by the dependency resolver for a given dependency set.
+.It Fl -env Ns = Ns Ar VARNAME
+Print the requested values as variable declarations in a similar format as the
+.Xr env 1
+command.
+.It Fl -fragment-filter Ns = Ns Ar TYPES
+Filter the fragment lists for the specified types.
+.It Fl -modversion
+Print the version of the queried module.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width indent
@@ -168,10 +211,21 @@ flag.
 .Sq logfile
 which is used for dumping audit information concerning installed module versions.
 .It Va PKG_CONFIG_DEBUG_SPEW
-If set, enables additional debug logging. The format of the debug log messages is
-implementation-specific.
+If set, enables additional debug logging.
+The format of the debug log messages is implementation-specific.
+.It Va PKG_CONFIG_DONT_RELOCATE_PATHS
+If set, disables the path relocation feature.
+.It Va PKG_CONFIG_MSVC_SYNTAX
+If set, uses MSVC syntax for fragments.
+.It Va PKG_CONFIG_FDO_SYSROOT_RULES
+If set, follow the sysroot prefixing rules that freedesktop.org pkg-config uses.
+.It Va DESTDIR
+If set to PKG_CONFIG_SYSROOT_DIR, assume that PKG_CONFIG_FDO_SYSROOT_RULES is set.
 .El
 .Sh EXAMPLES
 Displaying the CFLAGS of a package:
 .Dl $ pkgconf --cflags foo
 .Dl -fPIC -I/usr/include/foo
+.Sh SEE ALSO
+.Xr pc 5 ,
+.Xr pkg.m4 7

meson.build

@@ -0,0 +1,147 @@
+project('pkgconf', 'c',
+  version : '2.2.0',
+  license : 'ISC',
+  meson_version : '>=0.49',
+  default_options : ['c_std=c99'],
+)
+
+cc = meson.get_compiler('c')
+
+add_project_arguments(
+  '-D_BSD_SOURCE',
+  '-D_DEFAULT_SOURCE',
+  cc.get_supported_arguments(
+    '-Wimplicit-function-declaration',
+    '-Wmisleading-indentation',
+  ),
+  language : 'c',
+)
+
+cdata = configuration_data()
+
+check_functions = [
+  ['strlcat', 'string.h'],
+  ['strlcpy', 'string.h'],
+  ['strndup', 'string.h'],
+  ['strdup', 'string.h'],
+  ['strncasecmp', 'strings.h'],
+  ['strcasecmp', 'strings.h'],
+  ['reallocarray', 'stdlib.h'],
+]
+
+foreach f : check_functions
+  name = f[0].to_upper().underscorify()
+  if cc.has_function(f[0], prefix : '#define _BSD_SOURCE\n#include <@0@>'.format(f[1])) and cc.has_header_symbol(f[1], f[0], prefix : '#define _BSD_SOURCE')
+    cdata.set('HAVE_@0@'.format(name), 1)
+    cdata.set('HAVE_DECL_@0@'.format(name), 1)
+  else
+    cdata.set('HAVE_DECL_@0@'.format(name), 0)
+  endif
+endforeach
+
+default_path = []
+foreach f : ['libdir', 'datadir']
+  default_path += [join_paths(get_option('prefix'), get_option(f), 'pkgconfig')]
+endforeach
+
+personality_path = []
+foreach f : ['libdir', 'datadir']
+  personality_path += [join_paths(get_option('prefix'), get_option(f), 'pkgconfig', 'personality.d')]
+endforeach
+
+SYSTEM_LIBDIR = get_option('with-system-libdir')
+if SYSTEM_LIBDIR != ''
+  cdata.set_quoted('SYSTEM_LIBDIR', SYSTEM_LIBDIR)
+else
+  cdata.set_quoted('SYSTEM_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+endif
+SYSTEM_INCLUDEDIR = get_option('with-system-includedir')
+if SYSTEM_INCLUDEDIR != ''
+  cdata.set_quoted('SYSTEM_INCLUDEDIR', SYSTEM_INCLUDEDIR)
+else
+  cdata.set_quoted('SYSTEM_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir')))
+endif
+cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path))
+cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
+cdata.set_quoted('PACKAGE_NAME', meson.project_name())
+cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
+cdata.set_quoted('PACKAGE_BUGREPORT', 'https://todo.sr.ht/~kaniini/pkgconf')
+cdata.set('abs_top_srcdir', meson.current_source_dir())
+cdata.set('abs_top_builddir', meson.current_build_dir())
+
+
+subdir('libpkgconf')
+
+libtype = get_option('default_library')
+if libtype == 'static'
+  build_static = '-DPKGCONFIG_IS_STATIC'
+else
+  build_static = '-DPKGCONFIG_IS_NOT_STATIC'
+endif
+
+libpkgconf = library('pkgconf',
+  'libpkgconf/argvsplit.c',
+  'libpkgconf/audit.c',
+  'libpkgconf/bsdstubs.c',
+  'libpkgconf/cache.c',
+  'libpkgconf/client.c',
+  'libpkgconf/dependency.c',
+  'libpkgconf/fileio.c',
+  'libpkgconf/fragment.c',
+  'libpkgconf/parser.c',
+  'libpkgconf/path.c',
+  'libpkgconf/personality.c',
+  'libpkgconf/pkg.c',
+  'libpkgconf/queue.c',
+  'libpkgconf/tuple.c',
+  c_args: ['-DLIBPKGCONF_EXPORT', build_static],
+  install : true,
+  version : '5.0.0',
+  soversion : '5',
+)
+
+# For other projects using libpkgconfig as a subproject
+dep_libpkgconf = declare_dependency(
+  link_with : libpkgconf,
+  include_directories : include_directories('.'),
+)
+
+# If we have a new enough meson override the dependency so that only
+# `dependency('libpkgconf')` is required from the consumer
+if meson.version().version_compare('>= 0.54.0')
+  meson.override_dependency('libpkgconf', dep_libpkgconf)
+endif
+
+pkg = import('pkgconfig')
+pkg.generate(libpkgconf,
+  name : 'libpkgconf',
+  description : 'a library for accessing and manipulating development framework configuration',
+  url: 'http://github.com/pkgconf/pkgconf',
+  filebase : 'libpkgconf',
+  subdirs: ['pkgconf'],
+  extra_cflags : build_static
+)
+
+
+pkgconf_exe = executable('pkgconf',
+  'cli/main.c',
+  'cli/getopt_long.c',
+  'cli/renderer-msvc.c',
+  link_with : libpkgconf,
+  c_args: build_static,
+  install : true)
+
+with_tests = get_option('tests')
+kyua_exe = find_program('kyua', required : with_tests, disabler : true)
+atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true)
+kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
+test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
+subdir('tests')
+
+install_man('man/pkgconf.1')
+install_man('man/pkg.m4.7')
+install_man('man/pc.5')
+install_man('man/pkgconf-personality.5')
+install_data('pkg.m4', install_dir: 'share/aclocal')
+install_data('AUTHORS', install_dir: 'share/doc/pkgconf')
+install_data('README.md', install_dir: 'share/doc/pkgconf')

meson_options.txt

@@ -0,0 +1,19 @@
+option(
+  'tests',
+  type: 'feature',
+  description: 'Build tests which depends upon the kyua framework',
+)
+
+option(
+  'with-system-libdir',
+  type: 'string',
+  value: '',
+  description: 'Specify the system library directory (default {prefix}/{libdir})'
+)
+
+option(
+  'with-system-includedir',
+  type: 'string',
+  value: '',
+  description: 'Specify the system include directory (default {prefix}/{includedir})'
+)

pkg.m4

@@ -1,29 +1,66 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+dnl
+dnl If pkg-config is not found or older than specified, it will result
+dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
+dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
+dnl You can specify [PKG_CONFIG=false] as an action instead, which would
+dnl result in pkg-config tests failing, but no bogus error messages.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -44,19 +81,23 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
+fi
+if test -z "$PKG_CONFIG"; then
+	m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurrence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -66,8 +107,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -79,10 +122,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,26 +134,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -119,17 +161,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+        # Put the nasty error message in config.log where it belongs
+        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default([$4], [AC_MSG_ERROR(
+        m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -140,8 +182,8 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
+        AC_MSG_RESULT([no])
+        m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -151,20 +193,45 @@ _PKG_TEXT
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
         ])
 else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	$3
+        $3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -175,16 +242,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -195,13 +264,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -210,17 +281,16 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
 
-# PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-#                  [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-#                  [DESCRIPTION], [DEFAULT])
-#
-# Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX]
-# name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single
-# macro
-#
-# --------------------------------------------------------------
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
 AC_DEFUN([PKG_WITH_MODULES],
 [
 m4_pushdef([with_arg], m4_tolower([$1]))
@@ -250,38 +320,33 @@ m4_popdef([with_arg])
 m4_popdef([description])
 m4_popdef([def_arg])
 
-]) dnl PKG_WITH_MODULES
+])dnl PKG_WITH_MODULES
 
-# PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-#                       [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to trigger AM_CONDITIONAL after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make variable.
-#
-# --------------------------------------------------------------
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
 AC_DEFUN([PKG_HAVE_WITH_MODULES],
 [
 PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
 
 AM_CONDITIONAL([HAVE_][$1],
                [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])
+])dnl PKG_HAVE_WITH_MODULES
 
-# PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-#                              [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.
-#
-# --------------------------------------------------------------
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
 AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
 [
 PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
 
 AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
         [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES

scripts/install_deps.sh

@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (c) 2012 Bryan Drewery <bryan@shatow.net>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer
-#    in this position and unchanged.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Install build dependencies for pkg on Mac or Linux (Debiaun/Ubuntu) systems.
-#
-# This script is primarily intended for travis CI to be able to setup the
-# build environment.
-
-install_from_github() {
-	local name="${1}"
-	local ver="${2}"
-	local distname="${name}-${ver}"
-
-	# https://github.com/jmmv/kyua/releases/download/kyua-0.12/kyua-0.12.tar.gz
-	local url="https://github.com/jmmv/${name}"
-	wget "${url}/releases/download/${distname}/${distname}.tar.gz"
-	tar -xzvf "${distname}.tar.gz"
-
-	cd "${distname}"
-	./configure \
-		--disable-developer \
-		--without-atf \
-		--without-doxygen \
-		CPPFLAGS="-I/usr/local/include" \
-		LDFLAGS="-L/usr/local/lib -Wl,-R/usr/local/lib" \
-		PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-	make
-	sudo make install
-	cd -
-
-	rm -rf "${distname}" "${distname}.tar.gz"
-}
-
-if [ $(uname -s) = "Darwin" ]; then
-	brew update
-	brew install libarchive --with-xz
-	brew install openssl
-	brew install kyua
-elif [ $(uname -s) = "Linux" ]; then
-	install_from_github atf 0.21
-	install_from_github lutok 0.4
-	install_from_github kyua 0.12
-fi

tests/basic.sh

@@ -29,10 +29,17 @@ tests_init \
 	libs_circular_directpc \
 	libs_static \
 	libs_static_ordering \
+	libs_metapackage \
+	license_isc \
+	license_noassertion \
+	modversion_noflatten \
 	pkg_config_path \
 	nolibs \
 	nocflags \
-	arbitary_path
+	arbitary_path \
+	with_path \
+	relocatable \
+	single_depth_selectors
 
 noargs_body()
 {
@@ -44,7 +51,7 @@ libs_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L/test/lib -lfoo  \n" \
+		-o inline:"-L/test/lib -lfoo\n" \
 		pkgconf --libs foo
 }
 
@@ -52,7 +59,7 @@ libs_cflags_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
 		pkgconf --cflags --libs foo
 }
 
@@ -61,7 +68,7 @@ libs_cflags_version_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
 		pkgconf --cflags --libs 'foo > 1.2'
 }
 
@@ -69,7 +76,7 @@ libs_cflags_version_multiple_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
 		pkgconf --cflags --libs 'foo > 1.2 bar >= 1.3'
 }
 
@@ -77,7 +84,7 @@ libs_cflags_version_multiple_coma_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
 		pkgconf --cflags --libs 'foo > 1.2,bar >= 1.3'
 }
 
@@ -85,7 +92,7 @@ libs_cflags_version_alt_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
 		pkgconf --cflags --libs 'foo' '>' '1.2'
 }
 
@@ -93,7 +100,7 @@ libs_cflags_version_different_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo  \n" \
+		-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
 		pkgconf --cflags --libs 'foo' '!=' '1.3.0'
 }
 
@@ -173,7 +180,7 @@ exists_version_bad3_body()
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
 		-s exit:1 \
-		pkgconf --exists 'tilde <= 1.0.0'
+		pkgconf --exists 'tilde >= 1.0.0'
 }
 
 exists_body()
@@ -187,7 +194,7 @@ exists2_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		pkgconf --exists 'tilde >= 1.0.0'
+		pkgconf --exists 'tilde <= 1.0.0'
 }
 
 exists3_body()
@@ -201,30 +208,30 @@ libs_intermediary_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-lintermediary-1 -lintermediary-2 -lfoo -lbar -lbaz  \n" \
+		-o inline:"-lintermediary-1 -lintermediary-2 -lfoo -lbar -lbaz\n" \
 		pkgconf --libs intermediary-1 intermediary-2
 }
 
-libs_circular1_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	atf_check \
-		-o inline:"-lcircular-1 -lcircular-2 -lcircular-3  \n" \
-		pkgconf --libs circular-1
-}
-
 libs_circular2_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-lcircular-3 -lcircular-1 -lcircular-2  \n" \
-		pkgconf --libs circular-3
+		-o inline:"circular-1: breaking circular reference (circular-1 -> circular-2 -> circular-1)\n" \
+		pkgconf circular-2 --validate
+}
+
+libs_circular1_body()
+{
+	export PKG_CONFIG_PATH="${selfdir}/lib1"
+	atf_check \
+		-o inline:"circular-3: breaking circular reference (circular-3 -> circular-1 -> circular-3)\n" \
+		pkgconf circular-1 --validate
 }
 
 libs_circular_directpc_body()
 {
 	atf_check \
-		-o inline:"-lcircular-1 -lcircular-2 -lcircular-3  \n" \
+		-o inline:"-lcircular-3 -lcircular-1 -lcircular-2\n" \
 		pkgconf --libs ${selfdir}/lib1/circular-3.pc
 }
 
@@ -232,7 +239,7 @@ libs_static_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"/libfoo.a -pthread  \n" \
+		-o inline:"/libfoo.a -pthread\n" \
 		pkgconf --libs static-archive-libs
 }
 
@@ -240,26 +247,44 @@ libs_static_ordering_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L/test/lib -lbar -lfoo  \n" \
+		-o inline:"-L/test/lib -lbar -lfoo\n" \
 		pkgconf --libs foo bar
 }
 
+libs_metapackage_body()
+{
+	export PKG_CONFIG_PATH="${selfdir}/lib1"
+	atf_check \
+		-o inline:"-L/test/lib -lbar -lfoo\n" \
+		pkgconf --static --libs metapackage-3
+}
+
 pkg_config_path_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1${PATH_SEP}${selfdir}/lib2"
 	atf_check \
-		-o inline:"-L/test/lib -lfoo  \n" \
+		-o inline:"-L/test/lib -lfoo\n" \
 		pkgconf --libs foo
 	atf_check \
-		-o inline:"-L/test/lib -lbar -lfoo  \n" \
+		-o inline:"-L/test/lib -lbar -lfoo\n" \
 		pkgconf --libs bar
 }
 
+with_path_body()
+{
+	atf_check \
+		-o inline:"-L/test/lib -lfoo\n" \
+		pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs foo
+	atf_check \
+		-o inline:"-L/test/lib -lbar -lfoo\n" \
+		pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs bar
+}
+
 nolibs_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:" \n" \
+		-o inline:"\n" \
 		pkgconf --libs nolib
 }
 
@@ -267,7 +292,7 @@ nocflags_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:" \n" \
+		-o inline:"\n" \
 		pkgconf --cflags nocflag
 }
 
@@ -275,6 +300,43 @@ arbitary_path_body()
 {
 	cp ${selfdir}/lib1/foo.pc .
 	atf_check \
-		-o inline:"-L/test/lib -lfoo  \n" \
+		-o inline:"-L/test/lib -lfoo\n" \
 		pkgconf --libs foo.pc
 }
+
+relocatable_body()
+{
+	basedir=$(pkgconf --relocate ${selfdir})
+	atf_check \
+		-o inline:"${basedir}/lib-relocatable\n" \
+		pkgconf --define-prefix --variable=prefix ${basedir}/lib-relocatable/lib/pkgconfig/foo.pc
+}
+
+single_depth_selectors_body()
+{
+	export PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH=1
+	atf_check \
+		-o inline:"foo\n" \
+		pkgconf --with-path=${selfdir}/lib3 --print-requires bar
+}
+
+license_isc_body()
+{
+	atf_check \
+		-o inline:"foo: ISC\n" \
+		pkgconf --with-path=${selfdir}/lib1 --license foo
+}
+
+license_noassertion_body()
+{
+	atf_check \
+		-o inline:"bar: NOASSERTION\nfoo: ISC\n" \
+		pkgconf --with-path=${selfdir}/lib1 --license bar
+}
+
+modversion_noflatten_body()
+{
+	atf_check \
+		-o inline:"1.3\n" \
+		pkgconf --with-path=${selfdir}/lib1 --modversion bar
+}

tests/builtins.sh

@@ -12,7 +12,7 @@ modversion_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"1.0.1  \n" \
+		-o inline:"1.0.1 \n" \
 		pkgconf --modversion pkg-config
 }
 
@@ -20,7 +20,7 @@ variable_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"/test  \n" \
+		-o inline:"/test \n" \
 		pkgconf --variable=prefix foo
 }
 
@@ -28,7 +28,7 @@ define_variable_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"/test2  \n" \
+		-o inline:"/test2 \n" \
 		pkgconf --define-variable=prefix=/test2 --variable=prefix foo
 }
 
@@ -36,7 +36,7 @@ global_variable_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"${selfdir}/lib1  \n"
+		-o inline:"${selfdir}/lib1 \n"
 		pkgconf --exists -foo
 }
 
@@ -44,7 +44,7 @@ argv_parse_3_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-llib-1 -pthread /test/lib/lib2.so  \n" \
+		-o inline:"-llib-1 -pthread /test/lib/lib2.so \n" \
 		pkgconf --libs argv-parse-3
 }
 
@@ -52,10 +52,10 @@ tilde_quoting_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L~ -ltilde  \n" \
+		-o inline:"-L~ -ltilde \n" \
 		pkgconf --libs tilde-quoting
 	atf_check \
-		-o inline:"-I~  \n" \
+		-o inline:"-I~ \n" \
 		pkgconf --cflags tilde-quoting
 }
 
@@ -63,6 +63,6 @@ paren_quoting_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L\$(libdir) -ltilde  \n" \
+		-o inline:"-L\$(libdir) -ltilde \n" \
 		pkgconf --libs paren-quoting
 }

tests/conflicts.sh

@@ -10,7 +10,7 @@ libs_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L/test/lib -lconflicts  \n" \
+		-o inline:"-L/test/lib -lconflicts\n" \
 		pkgconf --libs conflicts
 }
 
@@ -18,6 +18,6 @@ ignore_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-L/test/lib -lconflicts  \n" \
+		-o inline:"-L/test/lib -lconflicts\n" \
 		pkgconf --ignore-conflicts --libs conflicts
 }

tests/framework.sh

@@ -9,12 +9,12 @@ libs_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-F/test/lib -framework framework-1  \n" \
+		-o inline:"-F/test/lib -framework framework-1\n" \
 		pkgconf --libs framework-1
 	atf_check \
-		-o inline:"-F/test/lib -framework framework-2 -F/test/lib -framework framework-1  \n" \
+		-o inline:"-F/test/lib -framework framework-2 -framework framework-1\n" \
 		pkgconf --libs framework-2
 	atf_check \
-		-o inline:"-F/test/lib -framework framework-1 -F/test/lib -framework framework-2  \n" \
+		-o inline:"-F/test/lib -framework framework-2 -framework framework-1\n" \
 		pkgconf --libs framework-1 framework-2
 }

tests/lib-relocatable/lib/pkgconfig/foo.pc

@@ -0,0 +1,11 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: foo
+Description: A testing pkg-config file
+Version: 1.2.3
+Libs: -L${libdir} -lfoo
+Cflags: -fPIC -I${includedir}/foo
+Cflags.private: -DFOO_STATIC

tests/lib1/billion-laughs.pc

@@ -0,0 +1,13 @@
+v9=lol
+v8=${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}${v9}
+v7=${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}${v8}
+v6=${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}${v7}
+v5=${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}${v6}
+v4=${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}${v5}
+v3=${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}${v4}
+v2=${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}${v3}
+v1=${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}${v2}
+v0=${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}${v1}
+Name: One Billion Laughs
+Version: ${v0}
+Description: Don't install this!

tests/lib1/cflags-internal.pc

@@ -0,0 +1,9 @@
+prefix=/test/local
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: cflags-internal
+Description: A testing pkg-config file
+Version: 1.2.3
+Cflags: -I${includedir}/foo

tests/lib1/empty-tuple.pc

@@ -0,0 +1,6 @@
+xcflags=
+
+Name: empty-tuple
+Description: testing file
+Version: 1
+CFlags: ${xcflags}

tests/lib1/escaped-backslash.pc

@@ -0,0 +1,4 @@
+Name: escaped-backslash
+Version: 1
+Description: test package for backslash escape scenario
+Cflags: -IC:\\A

tests/lib1/explicit-sysroot.pc

@@ -0,0 +1,7 @@
+prefix=/usr
+datarootdir=${prefix}/share
+pkgdatadir=${pc_sysrootdir}/${datarootdir}/test
+
+Name: Test
+Description: Testing pc_sysrootdir auto-expansion
+Version: 1.0

tests/lib1/foo.pc

@@ -9,3 +9,4 @@ Version: 1.2.3
 Libs: -L${libdir} -lfoo
 Cflags: -fPIC -I${includedir}/foo
 Cflags.private: -DFOO_STATIC
+License: ISC

tests/lib1/foobar.pc

@@ -0,0 +1,12 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: foobar
+Description: A testing pkg-config file
+Version: 3.2.1
+Libs: -L${libdir} -lfoobar
+Cflags: -fPIC -I${includedir}/foobar
+Cflags.private: -DFOOBAR_STATIC
+License: ISC

tests/lib1/fragment-collision-1.pc

@@ -0,0 +1,4 @@
+Name: fragment-collision-1
+Version: 0
+Description: fragment collision test package
+Cflags: -D_THREAD_SAFE -pthread

tests/lib1/fragment-collision-2.pc

@@ -0,0 +1,4 @@
+Name: fragment-collision-2
+Version: 0
+Description: fragment collision test package
+CFlags: -D_FOO

tests/lib1/fragment-collision-intermediary.pc

@@ -0,0 +1,5 @@
+Name: fragment-collision-intermediary
+Version: 0
+Description: fragment collision test package
+Requires.private: fragment-collision-1, fragment-collision-2
+CFlags: -D_BAR

tests/lib1/fragment-collision.pc

@@ -0,0 +1,6 @@
+Name: fragment-collision
+Version: 0
+Description: fragment collision test package
+Requires: fragment-collision-2, fragment-collision-intermediary
+Requires.private: fragment-collision-1
+Cflags: -D_BAZ

tests/lib1/fragment-comment.pc

@@ -0,0 +1,4 @@
+Name: fragment-comment
+Description: Test case for issue #215
+Version: 1.0
+Cflags: kuku=\#ttt

tests/lib1/fragment-escaping-1.pc

@@ -0,0 +1,5 @@
+Name: fragment-escaping-1
+Version: 0
+Description: fragment escaping test
+Cflags: "-IC:\\D E"
+Libs: "-LC:\\D E" -lE

tests/lib1/fragment-escaping-2.pc

@@ -0,0 +1,4 @@
+Name: fragment-escaping-2
+Version: 0
+Description: fragment escaping test
+Cflags: '-IC:\D E'

tests/lib1/fragment-escaping-3.pc

@@ -0,0 +1,4 @@
+Name: fragment-escaping-3
+Version: 0
+Description: fragment escaping test
+Cflags: -IC:\\D\ E

tests/lib1/fragment-quoting-2.pc

@@ -0,0 +1,10 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: fragment-quoting
+Description: A testing pkg-config file
+Version: 1.2.3
+Cflags: -fPIC -I${includedir}/foo -DQUOTED="${prefix}/share/doc"
+Cflags.private: -DFOO_STATIC

tests/lib1/fragment-quoting-3.pc

@@ -0,0 +1,10 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: fragment-quoting
+Description: A testing pkg-config file
+Version: 1.2.3
+Cflags: -fPIC -I${includedir}/foo -DQUOTED=\"${prefix}/share/doc\"
+Cflags.private: -DFOO_STATIC

tests/lib1/fragment-quoting-5.pc

@@ -0,0 +1,10 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: fragment-quoting-5
+Description: A testing pkg-config file
+Version: 1.2.3
+Cflags: -fPIC -I${includedir}/foo -DQUOTED='${prefix}/share/doc'
+Cflags.private: -DFOO_STATIC

tests/lib1/fragment-quoting-7.pc

@@ -0,0 +1,4 @@
+Name: fragment-quoting-7
+Description: A testing pkg-config file, this time from Go
+Version: 1.2.3
+Cflags: -Dhello=10 -Dworld=+32 -DDEFINED_FROM_PKG_CONFIG=hello\ world

tests/lib1/fragment-quoting.pc

@@ -0,0 +1,10 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: fragment-quoting
+Description: A testing pkg-config file
+Version: 1.2.3
+Cflags: -fPIC -I${includedir}/foo -DQUOTED='"${prefix}/share/doc"'
+Cflags.private: -DFOO_STATIC

tests/lib1/malformed-1.pc

@@ -0,0 +1,2 @@
+prefix=/usr\nName: GKrellM\nDescription: Extensible GTK system monitoring application\nVersion: 2.3.7\nRequires: gtk+-2.0 >= 2.4.0\nCflags: -I/usr/include\n
+

tests/lib1/malformed-quoting.pc

@@ -0,0 +1,4 @@
+Name: malformed-quoting
+Version: 1
+Description: None.
+Cflags: '-I/ABC

tests/lib1/malformed-version.pc

@@ -0,0 +1,5 @@
+Name: malformed-version
+Version: 3.922 2018-03-17
+Description: None.
+Cflags: -Ifoo
+Libs: -lbar

tests/lib1/metapackage-1.pc

@@ -0,0 +1,6 @@
+Name: metapackage-1
+Version: 0.1
+Description: metapackage for testing purposes
+Requires.private: metapackage-2
+Libs: -lmetapackage-1
+Cflags: -I/metapackage-1

tests/lib1/metapackage-2.pc

@@ -0,0 +1,5 @@
+Name: metapackage-2
+Version: 0.1
+Description: metapackage for testing purposes
+Libs: -lmetapackage-2
+Cflags: -I/metapackage-2

tests/lib1/metapackage-3.pc

@@ -0,0 +1,4 @@
+Name: metapackage-3
+Version: 0.1
+Description: metapackage for testing purposes
+Requires.private: bar

tests/lib1/metapackage.pc

@@ -0,0 +1,4 @@
+Name: metapackage
+Version: 0.1
+Description: metapackage for testing purposes
+Requires: metapackage-1, metapackage-2

tests/lib1/multiline-bogus.pc

@@ -0,0 +1,9 @@
+prefix=/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: multiline
+Description: A multiline
+description blah blah blah
+Version: 1.2.3

tests/lib1/omg-sysroot-uninstalled.pc

@@ -0,0 +1,10 @@
+prefix=${pc_sysrootdir}/test
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: omg-sysroot
+Description: A testing pkg-config file
+Version: 1.2.3
+Libs: -L${libdir} -lomg
+Cflags: -fPIC -I${includedir}/omg

tests/lib1/orphaned-requires-private.pc

@@ -0,0 +1,8 @@
+Name: orphaned-requires-private
+Version: 1
+Description: A testing module for pkgconf
+URL: http://www.pkgconf.org/
+Requires: foo
+Requires.private: orphaned-foo
+Cflags: -DUNREACHABLE
+Libs:

tests/lib1/quotes.pc

@@ -7,4 +7,4 @@ Name: quotes
 Description: A testing pkg-config file
 Version: 1.2.3
 Libs: -L${libdir} -lfoo
-Cflags: -DQUOTED=\"bla\"
+Cflags: -DQUOTED=\"bla\" -DA=\"escaped\ string\'\ \literal\" -DB="\1\$" -DC='bla'

tests/lib1/requires-internal-2.pc

@@ -0,0 +1,9 @@
+prefix=/test/local
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: requires-internal
+Description: A testing pkg-config file
+Version: 1.2.3
+Requires.internal: cflags-internal

tests/lib1/requires-internal-collision.pc

@@ -0,0 +1,10 @@
+prefix=/test/local
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: requires-internal
+Description: A testing pkg-config file
+Version: 1.2.3
+Requires.internal: cflags-internal
+Requires.private: cflags-internal