aboutsummaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorphilipvdh <philip@vd-hoeven.nl>2022-06-23 19:47:00 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-07-09 10:06:10 +0700
commitd7c419eb4a299c5fa96605023b28372532ae8509 (patch)
treefead7f57d3ac8909d527cc8722cc6078f3c10c98 /development
parentfb759f1f3caf982aaff4767b19d5cbd7d8f5841e (diff)
development/android-tools: Fix go modules being downloaded.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/android-tools/README3
-rw-r--r--development/android-tools/android-tools.SlackBuild7
2 files changed, 5 insertions, 5 deletions
diff --git a/development/android-tools/README b/development/android-tools/README
index f84cf9798e3c9..81d40297a3f76 100644
--- a/development/android-tools/README
+++ b/development/android-tools/README
@@ -1,6 +1,3 @@
These are the adb, append2simg, fastboot, img2simg, mke2fs.android
and simg2img tools from the android sdk.
-Warning: This SlackBuild requires network access when it runs, meaning
-it downloads files from the Internet with root access. You should
-decide for yourself whether or not you think this is a good idea.
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 2c057fefbcf17..c858d18140d18 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=android-tools
VERSION=${VERSION:-31.0.3p1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -81,13 +81,16 @@ 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 {} \;
+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