commit: c9634666aaa82628340a60f2b70d9658585b65ba
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 19:42:57 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan 29 19:43:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c9634666
dev-util/android-tools: bump to 8.1.0_p1
dev-util/android-tools/Manifest | 17 ++-
.../android-tools/android-tools-6.0.1_p79.ebuild | 22 +++-
.../android-tools/android-tools-8.1.0_p1.ebuild | 127 +++++++++++++++++++++
3 files changed, 155 insertions(+), 11 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index b5c2691..f7a9ade 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,5 +1,12 @@
-DIST android-tools-6.0.1_r79-arch.tar.gz 13466 SHA256
8e20e1c28f80e6d52070883e35cd333d3bb1dbd2f18ab2625bf64f74829b4f34 SHA512
90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
WHIRLPOOL
ce0ade8bf372bc01c20357f2bb7dfa1bebc4b7a3d08c9987a786b2d1563d12be47c51c8ca286c065165d3b66a03db3324fc8b7f11f58b2d7a76e92ed2ad2178b
-DIST android-tools-6.0.1_r79-core.tar.gz 1186562 SHA256
2de9f6327c2b00d6b1eca7f97ceccc5b4f3302bb8c2abcc0d51e855e5e6dd3af SHA512
a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
WHIRLPOOL
636921ad316590109a1fe8d97b4da257c7d14ac0379591341828c10de8934786fb1bb355f6aa6dc99d6cae2878bda5d3947cb978ea80ca99a74d02ba4db2f048
-DIST android-tools-6.0.1_r79-extras.tar.gz 648657 SHA256
4c39fca97a419ec2b3c1edc6c558cac2777b64213df4a24fe281a343632d4a75 SHA512
e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
WHIRLPOOL
212cd122f87bcaf7a3b9cf550653faa4eccd869113dfb2e11a38bc396fb748c339c717b2ac2075979a8bc69baceb0272e44e610ee96490e37004baf7b141b6e5
-DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 SHA256
a69b7653b1886d58fb8e7104437b3751c440e9367051d8ec1b859db2202555ae SHA512
0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
WHIRLPOOL
23c2f6d95a92bb97290690534082810ff50817640e19e9567056194e4a01d28516433396bc0aa42c545b47738e739d21823007ffaa171e972789b7cb1c71be94
-DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 SHA256
f93426fa21aa4d57f95ed832d61edce3363b3c0e80c666b6fc98367fbc95003e SHA512
686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
WHIRLPOOL
d82d53133a54044e92db534b3c546b92ba77759999cc2890b202673d68120a42d8cda169d1298a5bb36e466e65c9c5191d01bc29fdf53d8e621b30a2ccafcd75
+DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B
ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef
SHA512
90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
+DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B
473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be
SHA512
a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
+DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B
4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9
SHA512
e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
+DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B
ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152
SHA512
0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
+DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B
f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b
SHA512
686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
+DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B
65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6
SHA512
5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
+DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B
afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82
SHA512
2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
+DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B
0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7
SHA512
bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
+DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B
b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8
SHA512
de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
+DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B
8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d
SHA512
8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
+DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B
34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53
SHA512
707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361
BLAKE2B
6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac
SHA512
171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
index e709ec6..41f425f 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -20,7 +20,7 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
LICENSE="Apache-2.0 BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl"
RDEPEND="sys-libs/zlib:=
@@ -29,7 +29,7 @@ RDEPEND="sys-libs/zlib:=
dev-libs/libpcre"
# dev-lang/ruby is necessary for build script generation.
DEPEND="${RDEPEND}
- dev-lang/ruby:*"
+ virtual/rubygems"
PATCHES=( "${FILESDIR}/${PN}-deffilemode.patch" )
@@ -54,7 +54,7 @@ src_prepare() {
mv core/*/* core/ || die
epatch arch/*/trunk/fix_build.patch
cp arch/*/trunk/generate_build.rb ./ || die
-
+ sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die
#616508
default
#580686
@@ -68,10 +68,20 @@ src_prepare() {
}
src_compile() {
- chmod +x ./generate_build.rb || die
- ./generate_build.rb > build.sh || die
+ # Dynamically detect rubygems interpreter (bug 631398).
+ local ruby_bin=$(type -P ruby)
ruby_error_log=${T}/generate_build.rb.log success=
+ for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
+ "${ruby_bin}" ./generate_build.rb 1> build.sh 2>
"${ruby_error_log}" && \
+ { success=1; break; }
+ done
+ if [[ -z ${success} ]]; then
+ cat "${ruby_error_log}" >&2
+ die "${ruby_bin} ./generate_build.rb failed"
+ fi
+ sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
chmod +x build.sh || die
- ./build.sh || die
+ tc-export CC CXX
+ bash -e ./build.sh || die
}
src_install() {
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
new file mode 100644
index 0000000..3eddd64
--- /dev/null
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs
cmake-utils python-r1 python-utils-r1
+
+MY_PV="${PV/_p/_r}"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/";
+# See helper scripts in files/ for creating these tarballs and getting this
hash.
+BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
+# The ninja file was created by running the ruby script from archlinux by hand
and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate
a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz
-> ${MY_P}-arch.tar.gz
+
https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz
-> ${MY_P}-core.tar.gz
+ https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz ->
boringssl-${BORINGSSL_SHA1}.tar.gz
+ mirror://gentoo/${MY_P}-extras.tar.xz
https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
+ mirror://gentoo/${MY_P}-selinux.tar.xz
https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
+ mirror://gentoo/${MY_P}-f2fs-tools.tar.xz
https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
+ mirror://gentoo/${MY_P}.ninja.xz
https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz";
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="python"
+
+DEPEND="sys-libs/zlib:=
+ dev-libs/libpcre2:=
+ virtual/libusb:1="
+RDEPEND="${DEPEND}
+ python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+ dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+ local archive="$1"
+ local dir="$2"
+
+ mkdir -p "${dir}"
+ pushd "${dir}" >/dev/null || die
+ unpack "${archive}"
+ if [[ ${dir} != ./* ]] ; then
+ mv */* ./ || die
+ fi
+ popd >/dev/null
+}
+
+src_unpack() {
+ unpack_into "${MY_P}-arch.tar.gz" arch
+ unpack_into "${MY_P}-core.tar.gz" core
+ unpack_into "${MY_P}-extras.tar.xz" extras
+ unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+ unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+ unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+ unpack "${MY_P}.ninja.xz"
+ mv "${MY_P}.ninja" "build.ninja" || die
+
+ # Avoid depending on gtest just for its prod headers when boringssl
bundles it.
+ ln -s ../../boringssl/third_party/googletest/include/gtest
core/include/ || die
+}
+
+src_prepare() {
+ cd "${S}"/core
+ eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+ eapply "${FILESDIR}"/${P}-build.patch
+ sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die
#616508
+
+ cd "${S}"/selinux
+ eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+ #580686
+ find "${S}" -name '*.h' -exec \
+ sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
+ -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C"
{\n#endif|' \
+ -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+ -i {} \; || die
+ sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
+ -i extras/ext4_utils/sha1.c || die
+
+ cd "${S}"
+ default
+
+ # The pregenerated ninja file expects the build/ dir.
+ BUILD_DIR="${CMAKE_USE_DIR}/build"
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ append-lfs-flags
+
+ cmake-utils_src_configure
+
+ sed -i \
+ -e "s:@CC@:$(tc-getCC):g" \
+ -e "s:@CXX@:$(tc-getCXX):g" \
+ -e "s:@CFLAGS@:${CFLAGS}:g" \
+ -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
+ -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
+ -e "s:@LDFLAGS@:${LDFLAGS}:g" \
+ -e "s:@PV@:${PV}:g" \
+ build.ninja || die
+}
+
+src_compile() {
+ # We only need a few libs from boringssl.
+ cmake-utils_src_compile libcrypto.a libssl.a
+
+ eninja
+}
+
+src_install() {
+ dobin adb fastboot
+ dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+ use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+ newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}
