git » android-tools.git » commit d8c4c02

diff --git a/.SRCINFO b/.SRCINFO
index afde747..7b4c688 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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
diff --git a/PKGBUILD b/PKGBUILD
index 2f17f93..40bb664 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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/fix-fastboot-flash.patch b/fix-fastboot-flash.patch
new file mode 100644
index 0000000..e076f1e
--- /dev/null
+++ b/fix-fastboot-flash.patch
@@ -0,0 +1,15 @@
+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.