diff options
| author | philipvdh <philip@vd-hoeven.nl> | 2024-09-09 19:02:58 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-09-10 11:35:45 +0700 |
| commit | 30eaa1c745811e8a46f791f54c81a785e9219423 (patch) | |
| tree | f2721e8a7a12a7bb7cf6b434bd0f89e3109e2039 | |
| parent | 0b29bcbe37ee93afd4533d076eea77d4c4b9f505 (diff) | |
development/android-tools: Updated for version 35.0.2
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/android-tools/android-tools.SlackBuild | 24 | ||||
| -rw-r--r-- | development/android-tools/android-tools.info | 8 |
2 files changed, 21 insertions, 11 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild index c85004761c94..5066bc02c356 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:-35.0.1} +VERSION=${VERSION:-35.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,6 +63,12 @@ else LIBDIRSUFFIX="" fi +if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then + EXTRAOPTS="-DOPENSSL_NO_ASM=ON" +else + EXTRAOPTS="" +fi + set -e rm -rf $PKG @@ -78,11 +84,6 @@ 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 @@ -91,7 +92,12 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -GNinja -Wno-dev \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_BUILD_TYPE=Release .. \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ + -Dprotobuf_MODULE_COMPATIBLE=ON \ + -DANDROID_TOOLS_LIBUSB_ENABLE_UDEV=ON \ + -DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON \ + $EXTRAOPTS "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. @@ -99,6 +105,10 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/android-tools/android-tools.info b/development/android-tools/android-tools.info index 4e5d673bcd6c..2d678115ab6b 100644 --- a/development/android-tools/android-tools.info +++ b/development/android-tools/android-tools.info @@ -1,10 +1,10 @@ PRGNAM="android-tools" -VERSION="35.0.1" +VERSION="35.0.2" HOMEPAGE="http://developer.android.com/sdk/" -DOWNLOAD="https://github.com/nmeum/android-tools/releases/download/35.0.1/android-tools-35.0.1.tar.xz" -MD5SUM="8e45c1441ea36ae6a744cdcd94f4affa" +DOWNLOAD="https://github.com/nmeum/android-tools/releases/download/35.0.2/android-tools-35.0.2.tar.xz" +MD5SUM="cc05807cb167d7fc8842df82aa3d4620" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gtest protobuf3" +REQUIRES="fmt gtest protobuf3" MAINTAINER="Philip van der Hoeven" EMAIL="philip@vd-hoeven.nl" |