From 6f4cca64ba524f3bb7b076776e940befef11390e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 27 Oct 2017 07:04:54 +0000 Subject: main/python3: fix cyclic dependency for tkinter Add a separate apkbuild for tkinter to avoid the cyclic buildtime dependency: python3 -> tk -> libX11 -> libxcb -> xcb-proto -> python3 --- main/python3/APKBUILD | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'main') diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD index 01ebaeb79e..89296a4ac3 100644 --- a/main/python3/APKBUILD +++ b/main/python3/APKBUILD @@ -2,19 +2,19 @@ # Contributor: Kiyoshi Aman pkgname=python3 +# the python2-tkinter's pkgver needs to be synchronized with this. pkgver=3.6.3 _basever="${pkgver%.*}" -pkgrel=3 +pkgrel=4 pkgdesc="A high-level scripting language" url="http://www.python.org" arch="all" license="custom" provides="py3-pip" subpackages="$pkgname-dev $pkgname-doc $pkgname-tests::noarch - $pkgname-tkinter:tkinter $pkgname-wininst" + $pkgname-wininst" makedepends="expat-dev libressl-dev zlib-dev ncurses-dev bzip2-dev xz-dev - sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev readline-dev - tk tk-dev" + sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev readline-dev" source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz musl-find_library.patch fix-xattrs-glibc.patch @@ -113,14 +113,6 @@ tests() { "$subpkgdir"/usr/lib/python$_basever/ } -tkinter() { - pkgdesc="A graphical user interface for the Python" - local libdir="usr/lib/python$_basever/lib-dynload" - - mkdir -p "$subpkgdir"/$libdir - mv "$pkgdir"/$libdir/_tkinter.*.so "$subpkgdir"/$libdir/ -} - wininst() { pkgdesc="Python wininst files" mkdir -p "$subpkgdir"/usr/lib/python$_basever/distutils/command -- cgit v1.2.3