aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-04-05 13:17:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-04-05 13:20:55 +0000
commit4320baae5c27a2075edfd7ed0de8ce38bd304705 (patch)
treef8ecd9a584f0c97a9e98153eebeac8dbc9ded0e3
parenta8484721682e1cc9bea6254f9b89d2bac0bfd9e8 (diff)
downloadaports-4320baae5c27a2075edfd7ed0de8ce38bd304705.tar.gz
aports-4320baae5c27a2075edfd7ed0de8ce38bd304705.tar.bz2
aports-4320baae5c27a2075edfd7ed0de8ce38bd304705.tar.xz
main/abuild: revert automatic unset of depends in split functions
this broke dependencies for at least various py-* packages.
-rw-r--r--main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch36
-rw-r--r--main/abuild/APKBUILD6
2 files changed, 40 insertions, 2 deletions
diff --git a/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch b/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch
new file mode 100644
index 0000000000..c2fac24d76
--- /dev/null
+++ b/main/abuild/0001-Revert-abuild-unset-depends-for-subpackages.patch
@@ -0,0 +1,36 @@
+From 745e53620b54025df94d206668f76429b0955b1f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 5 Apr 2019 13:13:24 +0000
+Subject: [PATCH] Revert "abuild: unset depends for subpackages"
+
+Apparently there are many packages that does soemthing like:
+
+subpackages="$pkgname-foo:_foo"
+
+_foo() {
+ depends="$depends something-else"
+}
+
+and thus depend on the previous behavior. We need to revert and plan
+this better.
+
+This reverts commit 8fbbffd201a28a06804c7f6d3a2b5cd948c6ce07.
+---
+ abuild.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index d19d12e..1222cb7 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -756,7 +756,6 @@ pre_split() {
+ return 0
+ fi
+ # the subpackages should not inherit those from main package
+- depends=""
+ provides=""
+ install_if=""
+ }
+--
+2.21.0
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 490178c970..4983839b45 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.4.0_rc1
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -21,6 +21,7 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
options="suid !check"
pkggroups="abuild"
source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
+ 0001-Revert-abuild-unset-depends-for-subpackages.patch
"
builddir="$srcdir/$pkgname-$_ver"
@@ -68,4 +69,5 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="97b6c12d3bc44794eae966d950ad0a2f915651fce76ea39c1c97700d04061be910a5bd66e9cff63bd1aaf6991ecb4a6eb9eb8477c4d12b2501666402d50b0c4b abuild-3.4.0_rc1.tar.xz"
+sha512sums="97b6c12d3bc44794eae966d950ad0a2f915651fce76ea39c1c97700d04061be910a5bd66e9cff63bd1aaf6991ecb4a6eb9eb8477c4d12b2501666402d50b0c4b abuild-3.4.0_rc1.tar.xz
+86bda138a5ab4ecd6fad8a0e8b3722d2bdbcbf2661682ce05b0fc16386ca3bddd2076c63079fb168b2d0e09d6037c38bcca4c4568fdc1fa590b4f66d979145bf 0001-Revert-abuild-unset-depends-for-subpackages.patch"