diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-25 14:56:25 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-25 14:56:25 +0100 |
| commit | 5c42677148c717eb9f4673237db807f74740b4e9 (patch) | |
| tree | ee9f721e91477693459f31721790f2f41839a74c /dev-util/android-tools | |
| parent | c9b5a916efac64df2a39870a92cc6b67116d1b9f (diff) | |
gentoo auto-resync : 25:08:2024 - 14:56:25
Diffstat (limited to 'dev-util/android-tools')
| -rw-r--r-- | dev-util/android-tools/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/android-tools/android-tools-35.0.1.ebuild | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 02fe6044dbfb..66e8c831a89c 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -6,5 +6,5 @@ DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e554 DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B e87a4ad13e5b8030069c87cbbe47f3698888e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab SHA512 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988 EBUILD android-tools-34.0.5.ebuild 3043 BLAKE2B d33a71e288ee587b001b7c027011a6cea28e7e8bae099c49a3ca83a3f167847dab81f4e424099b654bd4aa66ad4b4d6d807de6e4df33b7c58965960c3f930510 SHA512 f4b0fb5a1d5f5961888f7a23e4f8f20602923e9e1a6b027d04093ea972df02b6cf1561dfdb698cb6991bb0852879009ff4614997d035521eb36ed004c5ad2701 -EBUILD android-tools-35.0.1.ebuild 2612 BLAKE2B 5aac169b97f527c1c44b17b20bb49e98f88d0680bf37c64ed7da8669a714b3b408e6596cdbb9e63874c6f700a2567f1576d4492c2aa1a24a962f96897f52ead0 SHA512 1d38afc6e3829cc44ea551dc0afb026a45a0841f50afedbb86b87d51060739862e6064da0a71785d8195c330dda65711b4343270af7616428e52d105d4ef8a10 +EBUILD android-tools-35.0.1.ebuild 3046 BLAKE2B f062f4e6e07734f05752f77840c18cee5adb62e0d9fc475161429478e6ebf65cae960bb4bcb3778bf5cc6221907e7365c20f7f86fa8481f4c3a3fddb394c5247 SHA512 f00795422012d15b6e2cc8279524b926da88a62c680ce052f7c23a59a8e5da7dfe62617433690f881f1fa3d76b8e2075a4de1a5b9505882457acef4f5d43d8da MISC metadata.xml 666 BLAKE2B 826f37b3e3c762165b6dce866f9e244ff6c6312a7d7f061f55bedf6a53ec08276afcce53ebd0a3d8d7e5ab95065436c3ab559d0d1cc40ee5d66d958bb7bd36b0 SHA512 aa6da78d3bd0a5efa99629c20ecdd407235f9055af8d1891ef606d3fbc14e1054987239a50edc2ba1a74c97cbf81ce044ca6ab89a1c11a36500979103fe74437 diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild index 0ff6f3bbb94f..9dacbecf215d 100644 --- a/dev-util/android-tools/android-tools-35.0.1.ebuild +++ b/dev-util/android-tools/android-tools-35.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-r1 +inherit cmake flag-o-matic python-r1 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/" @@ -54,11 +54,26 @@ src_prepare() { eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" cd "${S}" || die + + # why do we depend on libandroidfw? It is never linked to or used. + # https://github.com/nmeum/android-tools/issues/148 + sed -i '/libandroidfw/d' vendor/CMakeLists.txt || die + rm -r vendor/base || die + rm -r patches || die cmake_src_prepare } src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # + # https://bugs.gentoo.org/858311 + # https://issuetracker.google.com/issues/347247969 + # + # and in vendored f2fs-tools copy: + # https://bugs.gentoo.org/863896 + filter-lto + local mycmakeargs=( # Statically link the bundled boringssl -DCMAKE_BUILD_TYPE=Release \ |