diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-26 20:02:22 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-18 18:23:03 +0100 |
commit | ed064d9361d64a4a635c9b160d20952777615ec7 (patch) | |
tree | 37b97f60c5d82e70684bd6af31a2e7a75e68441e | |
parent | bd73fabb2c22b54983d0f10ae0d7c7b441b26001 (diff) | |
download | alpine_aports-ed064d9361d64a4a635c9b160d20952777615ec7.tar.bz2 alpine_aports-ed064d9361d64a4a635c9b160d20952777615ec7.tar.xz alpine_aports-ed064d9361d64a4a635c9b160d20952777615ec7.zip |
main/py-sphinx: add all runtime deps to makedepends
We need to specify all the runtime dependencies for the subpackages in
global scope so the build order can be properly detected.
ref https://github.com/alpinelinux/aports/pull/4812
(cherry picked from commit a93d2b7eacde17d8e354f23524aa4b6ab43f3e7b)
-rw-r--r-- | main/py-sphinx/APKBUILD | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD index 9779565981..077aee5905 100644 --- a/main/py-sphinx/APKBUILD +++ b/main/py-sphinx/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=py-sphinx | 3 | pkgname=py-sphinx |
4 | _pkgname=${pkgname#py-} | 4 | _pkgname=${pkgname#py-} |
5 | pkgver=1.7.4 | 5 | pkgver=1.7.4 |
6 | pkgrel=0 | 6 | pkgrel=1 |
7 | pkgdesc="Python Documentation Generator" | 7 | pkgdesc="Python Documentation Generator" |
8 | url="http://sphinx.pocoo.org/" | 8 | url="http://sphinx.pocoo.org/" |
9 | arch="noarch" | 9 | arch="noarch" |
@@ -11,8 +11,10 @@ license="BSD" | |||
11 | _pydepends="py-docutils py-jinja2 py-pygments py-six py-sphinx_rtd_theme | 11 | _pydepends="py-docutils py-jinja2 py-pygments py-six py-sphinx_rtd_theme |
12 | py-alabaster<0.8 py-babel py-snowballstemmer py-imagesize | 12 | py-alabaster<0.8 py-babel py-snowballstemmer py-imagesize |
13 | py-requests py-sphinxcontrib-websupport py-setuptools py-packaging" | 13 | py-requests py-sphinxcontrib-websupport py-setuptools py-packaging" |
14 | _py2depends="make ${_pydepends//py-/py2-} py2-typing" | ||
15 | _py3depends="make ${_pydepends//py-/py3-}" | ||
14 | depends="py3-${pkgname#py-}" | 16 | depends="py3-${pkgname#py-}" |
15 | makedepends="python2-dev python3-dev py-setuptools" | 17 | makedepends="python2-dev python3-dev py-setuptools $_py2depends $_py3depends" |
16 | #checkdepends="pytest py-funcsigs py-pluggy" | 18 | #checkdepends="pytest py-funcsigs py-pluggy" |
17 | options="!check" # py-pluggy and some other packages needs to be moved to main first | 19 | options="!check" # py-pluggy and some other packages needs to be moved to main first |
18 | subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" | 20 | subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" |
@@ -53,12 +55,12 @@ package() { | |||
53 | 55 | ||
54 | _py2() { | 56 | _py2() { |
55 | replaces="$pkgname" | 57 | replaces="$pkgname" |
56 | depends="make ${_pydepends//py-/py2-} py2-typing" | 58 | depends="$_py2depends" |
57 | _py python2 | 59 | _py python2 |
58 | } | 60 | } |
59 | 61 | ||
60 | _py3() { | 62 | _py3() { |
61 | depends="make ${_pydepends//py-/py3-}" | 63 | depends="$_py3depends" |
62 | _py python3 | 64 | _py python3 |
63 | } | 65 | } |
64 | 66 | ||