Skip to content
Snippets Groups Projects
Unverified Commit d8c4c02a authored by Anatol Pomozov's avatar Anatol Pomozov
Browse files

upgpkg: 34.0.4-4

parent ae025378
No related branches found
Tags 34.0.4-4
No related merge requests found
pkgbase = android-tools
pkgdesc = Android platform tools
pkgver = 34.0.4
pkgrel = 3
pkgrel = 4
url = http://tools.android.com/
arch = x86_64
license = Apache
......@@ -18,6 +18,8 @@ pkgbase = android-tools
depends = android-udev
depends = pcre2
source = https://github.com/nmeum/android-tools/releases/download/34.0.4/android-tools-34.0.4.tar.xz
source = fix-fastboot-flash.patch
sha256sums = 7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1
sha256sums = ca78e22eee09d0b6f73fa954ac5fa5d85e3470cc8b98fa7ba1f32aaeef326f5b
pkgname = android-tools
......@@ -5,15 +5,23 @@
pkgname=android-tools
pkgver=34.0.4
_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
pkgrel=3
pkgrel=4
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
license=(Apache MIT)
depends=(libusb protobuf brotli zstd android-udev pcre2)
makedepends=(gtest cmake go ninja git)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
sha256sums=('7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1')
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
fix-fastboot-flash.patch)
sha256sums=('7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1'
'ca78e22eee09d0b6f73fa954ac5fa5d85e3470cc8b98fa7ba1f32aaeef326f5b')
prepare() {
cd android-tools-$_tag
patch -p1 < ../fix-fastboot-flash.patch
}
build() {
cd android-tools-$_tag
......
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 0ea7a01..d00ad86 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -16,6 +16,10 @@ if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_DARWIN_C_SOURCE -D__DARWIN_C_LEVEL=__DARWIN_C_FULL")
endif()
+# https://github.com/nmeum/android-tools/issues/133
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftrivial-auto-var-init=zero")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrivial-auto-var-init=zero")
+
# Android seems to use various attributes supported by clang but not by
# GCC which causes it to emit lots of warnings. Since these attributes
# don't seem to effect runtime behaviour simply disable the warnings.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment