diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-03-27 17:16:04 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-03-27 17:16:53 +0000 |
| commit | 75ce9a3d8c589bee905a01e5e0c065bfe7a8a302 (patch) | |
| tree | ddbb2cf19c61cc1e2ab3634c351e6d723b59de16 /main/abuild | |
| parent | eece3b18c46334c59918a362fe1111b91554b504 (diff) | |
| download | aports-75ce9a3d8c589bee905a01e5e0c065bfe7a8a302.tar.bz2 aports-75ce9a3d8c589bee905a01e5e0c065bfe7a8a302.tar.xz | |
main/abuild: hint to pkgconf that we are a dependency generator and don't want full SAT when generating dependencies
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch | 26 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/main/abuild/0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch b/main/abuild/0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch new file mode 100644 index 0000000000..3cc6a8b6f8 --- /dev/null +++ b/main/abuild/0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch @@ -0,0 +1,26 @@ +From dec68bd03fb989c5af3c2b95d4b8fafeeed6b0f5 Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Mon, 27 Mar 2017 06:00:03 +0000 +Subject: [PATCH] abuild: use new PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH env + variable to disable the SAT solver + +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 7cef63f..c6ee5f3 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -979,7 +979,7 @@ prepare_pkgconfig_provides() { + continue + fi + local f=${i##*/} +- local v=$(PKG_CONFIG_PATH="$dir"/usr/lib/pkgconfig pkg-config \ ++ local v=$(PKG_CONFIG_PATH="$dir"/usr/lib/pkgconfig PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH=1 pkg-config \ + --modversion ${f%.pc}) + echo "${f%.pc}=${v:-0}" >> "$controldir"/.provides-pc + done +-- +2.12.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index e9d4534946..9398aeae1f 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.0.0_rc2 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch" options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz + 0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch " builddir="$srcdir/$pkgname-$_ver" |