diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2018-08-14 13:41:24 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2018-08-14 13:41:24 +0900 |
| commit | afdc86d04b1f975504d5c707d6c6221e14d460b9 (patch) | |
| tree | 1579b9c435d8d46ca74d8b96fe0a9f82e538c1b7 | |
| parent | sys-libs/bionic: port bionic to gentoo toolchain. (diff) | |
| download | android-afdc86d04b1f975504d5c707d6c6221e14d460b9.tar.gz android-afdc86d04b1f975504d5c707d6c6221e14d460b9.tar.bz2 android-afdc86d04b1f975504d5c707d6c6221e14d460b9.zip | |
sys-libs/bionic: bump to EAPI-7 and BDEPEND on python-2.7
Helper script build/tools/fs_config/fs_config_generator.py
should be explicitly executed by python-2.7.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
| -rw-r--r-- | sys-libs/bionic/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/bionic/bionic-8.1.0_p41.ebuild | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-libs/bionic/Manifest b/sys-libs/bionic/Manifest index f7e5c6a..23d0f83 100644 --- a/sys-libs/bionic/Manifest +++ b/sys-libs/bionic/Manifest @@ -16,5 +16,5 @@ DIST llvm-8.1.0_p41.tar.gz 26253027 BLAKE2B 50687a47c6a271d0881f6a115d25a698c3fc DIST lzma-8.1.0_p41.tar.gz 733693 BLAKE2B 733b0995778adce01af50b9f22276ec4a54d3c73ff7b9709a6b3c0327dd89c0a785cb991dbd3343e4e7b9c5eb9009afaea3d78db993a48e1dcbaa9807fdaf7ff SHA512 4cebceabb9096c19ccf3ab25ef27d4ce6f1655e431c6381f888345613f310509864135bc0ee7fd78dc5f1170521effea2113f149e71cca56a07254566755c0c5 DIST safe-iop-8.1.0_p41.tar.gz 10800 BLAKE2B 02959e9a0f02259362bfbe840eae50bdfa429b09de8f56f8beec2f99697eabb4a0a71a175a79a52f943facded257a68bff383a53acbe61249b76fe2ff95911e1 SHA512 8b717408601194b76a6a44fec5bd62ff2121b89f5f8fea7b3eee7ca46c122e346f8d73d92f5b34575318b1015e74186affda1e1aca7b53ac9c3c303d4e8e7710 DIST zlib-8.1.0_p41.tar.gz 607311 BLAKE2B b175cf9d4548df24cfd587abea62ee4c3dcee56f6a68b4044c4b1419be148ab4542c42cb19ce0d773b247ceaf3193afca385170674c9d6d2f92a4df8f6d346ba SHA512 0d587729c1210ee6efa6bb7cdac723da71a9c56252be67f6973e80c3597dbb7f2c96ea093078e580d97709de5e8d8fabf92aae0594f382b95e2d9559e43953d2 -EBUILD bionic-8.1.0_p41.ebuild 3428 BLAKE2B 6f2a309f12e200acfd42eaa5f5eab13720e15476c0015e785136ce5b06e613724e338dd3a6d210515b20c5769e33ed4d18a942065647bea0ac5444993849e119 SHA512 0caf25d16d3d06768578c981fed5cdc0bfecb20767f3b8bac95f130c77776613693ec84de5d74dc936e6b921937b934b3fd63d1a67f334b7cbed8c6ba8992dd3 +EBUILD bionic-8.1.0_p41.ebuild 3543 BLAKE2B 6a1c4dd1877cfa32b250aa8e47042fe8c9e2430a242234c28f2191f2e792063076596fabd0739a270526d8f39cc641135c5aa2321ec4dc4fff7da619aa21b275 SHA512 d1f3b5a529e257f10aa6415c2c6ed29c75972af3c68b147c0f60b65047214a9f2ec139863b4673e276ac88abe7308e810a6d7f2a666e3eaec4f0789aea3e0c58 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/sys-libs/bionic/bionic-8.1.0_p41.ebuild b/sys-libs/bionic/bionic-8.1.0_p41.ebuild index fcd6271..3d8d6ef 100644 --- a/sys-libs/bionic/bionic-8.1.0_p41.ebuild +++ b/sys-libs/bionic/bionic-8.1.0_p41.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit ninja-utils @@ -19,9 +19,10 @@ SLOT=0 LICENSE="Apache-2.0" -DEPEND="dev-util/soong +BDEPEND="dev-util/soong dev-libs/libpcre2 - net-libs/libtirpc" + dev-lang/python:2.7" +DEPEND="net-libs/libtirpc" PATCHES=( "${FILESDIR}"/bionic-glibc-port.patch "${FILESDIR}"/bionic-binutils-port.patch @@ -40,6 +41,8 @@ src_unpack() { src_prepare() { default + sed -e '1s/python/python2/' -i build/tools/fs_config/fs_config_generator.py || die + # We are building a minimal bionic for toolchains. Ignore the # advanced optional features like tests and debug tools. rm -r ${PN}/{tests,tools,benchmarks,libc/malloc_debug} build/tools/acp || die |