aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-08-11 13:46:15 +0000
committeralice <alice@ayaya.dev>2022-08-11 13:46:53 +0000
commitdbbc1f364ca2ca75b67f8974b70c6b6f9b3cf044 (patch)
treea666ce7d110833983fcc0ed48d4a60fe8a33228a
parent69bc88b96eae95289c7df9c159f7f9c1f3444672 (diff)
downloadaports-dbbc1f364ca2ca75b67f8974b70c6b6f9b3cf044.tar.gz
aports-dbbc1f364ca2ca75b67f8974b70c6b6f9b3cf044.tar.bz2
aports-dbbc1f364ca2ca75b67f8974b70c6b6f9b3cf044.tar.xz
main/pkgconf: fix --cflags-only-I
-rw-r--r--main/pkgconf/APKBUILD9
-rw-r--r--main/pkgconf/fix-cflags-include.patch16
2 files changed, 22 insertions, 3 deletions
diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD
index fb89715044..85beed5a1c 100644
--- a/main/pkgconf/APKBUILD
+++ b/main/pkgconf/APKBUILD
@@ -1,16 +1,18 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=pkgconf
pkgver=1.9.2
-pkgrel=0
+pkgrel=1
pkgdesc="development framework configuration tools"
url="https://git.sr.ht/~kaniini/pkgconf"
arch="all"
license="ISC"
replaces="pkgconfig"
provides="pkgconfig=1"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
checkdepends="kyua atf"
+subpackages="$pkgname-doc $pkgname-dev"
+source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz
+ fix-cflags-include.patch
+ "
build() {
./configure \
@@ -47,4 +49,5 @@ dev() {
sha512sums="
97681487502567da9dbd41da38356078e5a09c512f3b463aa7e2d063c048c50719dc9d9e3b7ef98c8cf935f11b0c5b8f916263444168e3c893b0e35768e4a0f4 pkgconf-1.9.2.tar.xz
+0c0ee35d3ca2a052b18692ebbb14580a3a300068b0e1f4c0d10fa5523013e4eea4d28dbcd3947210b3d0b6acb07300b5baf66f04ab79d3ac195d150e227d503c fix-cflags-include.patch
"
diff --git a/main/pkgconf/fix-cflags-include.patch b/main/pkgconf/fix-cflags-include.patch
new file mode 100644
index 0000000000..f8f6738b23
--- /dev/null
+++ b/main/pkgconf/fix-cflags-include.patch
@@ -0,0 +1,16 @@
+diff --git a/cli/main.c b/cli/main.c
+index 50215fb..5ed2bea 100644
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -1141,6 +1141,11 @@ main(int argc, char *argv[])
+ want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
+ }
+
++ if ((want_flags & PKG_CFLAGS))
++ {
++ want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
++ }
++
+ if ((sysroot_dir = getenv("PKG_CONFIG_SYSROOT_DIR")) != NULL)
+ {
+ const char *destdir;