diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
| commit | ccaccfe4f1da8c11d9fa110f6e4eb847358769d7 (patch) | |
| tree | ff02c95ae3d9a1e73e2a182e268161743d81a88b /dev-util/android-tools | |
| parent | 74e526c590f52d24a213e25f77858ae0b34ec2c8 (diff) | |
gentoo auto-resync : 18:06:2024 - 00:10:02
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-34.0.5.ebuild | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index f08d5c6f9fd2..0378239c25fe 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -10,5 +10,5 @@ DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e554 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988 EBUILD android-tools-34.0.0.ebuild 2438 BLAKE2B 59b54a35075efb311afad6b54a70d3091a16bd16fe7d99e23d189784ab40481b89e36d836c076aeb5f134d320051375d7cabc8ff8bd5fa834b95cfa7de5fafae SHA512 019fc5ca93170e7a4441a806940621a2b03cc2e50443a8fe26a458aef1150605bbb5c12fecc45687aed2b64a51cb48369d341deaf325e92c98d15398493974a6 EBUILD android-tools-34.0.1.ebuild 2629 BLAKE2B e276806cb3c07c8123056839ffcb1ab0dda81b0abbd048e6305a504f5e12545304c8eb920a5902b082576e41f3eb9f68c1ceaf702df11950c51061de589b2557 SHA512 12512889b2f79c8e7ed64df366b3b51b4ff6a409a87f4249d5055b137c042f6c7a339d852d6ff95bd30954268e56a35ec668d4f63cb0aaad9624c663c0c86346 -EBUILD android-tools-34.0.5.ebuild 2609 BLAKE2B 9fe777d10b01e05ed9be3d507df00c56ac9315a6f8341506365d6bc99c04616ba76176f49dbc8796babf0b92d2280d73310b8d99d70d41c485668f96602189c5 SHA512 fb281408cd8aabe466ec70aee2c0d60904010affb9fb5f1f5a8e28d4ccf144846fbfd790e5a98c31d9c8beb4700c74a183e966ebdadf4e441f7f5aa3020e751e +EBUILD android-tools-34.0.5.ebuild 3043 BLAKE2B d33a71e288ee587b001b7c027011a6cea28e7e8bae099c49a3ca83a3f167847dab81f4e424099b654bd4aa66ad4b4d6d807de6e4df33b7c58965960c3f930510 SHA512 f4b0fb5a1d5f5961888f7a23e4f8f20602923e9e1a6b027d04093ea972df02b6cf1561dfdb698cb6991bb0852879009ff4614997d035521eb36ed004c5ad2701 MISC metadata.xml 666 BLAKE2B 826f37b3e3c762165b6dce866f9e244ff6c6312a7d7f061f55bedf6a53ec08276afcce53ebd0a3d8d7e5ab95065436c3ab559d0d1cc40ee5d66d958bb7bd36b0 SHA512 aa6da78d3bd0a5efa99629c20ecdd407235f9055af8d1891ef606d3fbc14e1054987239a50edc2ba1a74c97cbf81ce044ca6ab89a1c11a36500979103fe74437 diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild index 7df559af43f4..32ad5c7b7ab0 100644 --- a/dev-util/android-tools/android-tools-34.0.5.ebuild +++ b/dev-util/android-tools/android-tools-34.0.5.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 \ |