diff options
Diffstat (limited to 'development/android-tools/android-tools.SlackBuild')
| -rw-r--r-- | development/android-tools/android-tools.SlackBuild | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild index 2c057fefbc..680f6c2a72 100644 --- a/development/android-tools/android-tools.SlackBuild +++ b/development/android-tools/android-tools.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=android-tools -VERSION=${VERSION:-31.0.3p1} +VERSION=${VERSION:-34.0.5} 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 |