diff options
Diffstat (limited to 'development/android-tools')
-rw-r--r-- | development/android-tools/README | 1 | ||||
-rw-r--r-- | development/android-tools/android-tools.SlackBuild | 15 | ||||
-rw-r--r-- | development/android-tools/android-tools.info | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/development/android-tools/README b/development/android-tools/README index 6cbb93b0b5..81d40297a3 100644 --- a/development/android-tools/README +++ b/development/android-tools/README @@ -1,2 +1,3 @@ These are the adb, append2simg, fastboot, img2simg, mke2fs.android and simg2img tools from the android sdk. + diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild index 5b3eb73f2e..c85004761c 100644 --- a/development/android-tools/android-tools.SlackBuild +++ b/development/android-tools/android-tools.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for android-tools # Thanks to the Arch linux maintainers for the makefiles -# Copyright 2016, 2017 Philip van der Hoeven, Almere, NL +# Copyright 2016, 2017, 2022-2024 Philip van der Hoeven, Almere, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=android-tools -VERSION=${VERSION:-31.0.2} +VERSION=${VERSION:-35.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -81,13 +78,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# fix build with go 1.16.5 +sed -i 's%//go:build%// +build%' vendor/boringssl/crypto/err/err_data_generate.go + +export GOCACHE=$(pwd)/build/go-cache +export GO111MODULE=off + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -GNinja \ + -GNinja -Wno-dev \ -DCMAKE_BUILD_TYPE=Release .. "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install diff --git a/development/android-tools/android-tools.info b/development/android-tools/android-tools.info index cc3ca14508..4e5d673bcd 100644 --- a/development/android-tools/android-tools.info +++ b/development/android-tools/android-tools.info @@ -1,8 +1,8 @@ PRGNAM="android-tools" -VERSION="31.0.2" +VERSION="35.0.1" HOMEPAGE="http://developer.android.com/sdk/" -DOWNLOAD="https://github.com/nmeum/android-tools/releases/download/31.0.2/android-tools-31.0.2.tar.xz" -MD5SUM="abd9ec88b7fcba29601ad6107801f571" +DOWNLOAD="https://github.com/nmeum/android-tools/releases/download/35.0.1/android-tools-35.0.1.tar.xz" +MD5SUM="8e45c1441ea36ae6a744cdcd94f4affa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtest protobuf3" |