diff options
| author |   Philip van der Hoeven | 2016-11-08 23:56:46 +0100 |
|---|---|---|
| committer |   David Spencer | 2016-11-11 21:36:22 +0100 |
| commit | 935adfdbba821d4a79947f77a0e55efd71f84251 (patch) | |
| tree | 9983d6e342f1fb4d1cee358858a28a63680b84c6 /development/android-tools/android-tools.SlackBuild | |
| parent | c447589af8882fd7696c02a5ff212ccbed6035ee (diff) | |
| download | slackbuilds-935adfdbba821d4a79947f77a0e55efd71f84251.tar.gz | |
development/android-tools: Updated for version 7.1.0_r4.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development/android-tools/android-tools.SlackBuild')
| -rw-r--r-- | development/android-tools/android-tools.SlackBuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild index 5319905bfa..885478a27b 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 2015 Philip van der Hoeven, Almere, NL +# Copyright 2016 Philip van der Hoeven, Almere, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,18 +25,18 @@ PRGNAM=android-tools -VERSION=${VERSION:-6.0.1_r43} -SRC1=core-ad54cfed4516292654c997910839153264ae00a0.tar.gz -SRC2=extras-83eeed92430fc3f14c21cfc43d11fcecef6e8285.tar.gz -SRC3=libselinux-943ed44a46ed95d557bf552b57fe61280a77489c.tar.gz -SRC4=f2fs-tools-3686eecd8c8511ae7ecd7611a2f065b48b484b13.tar.gz +VERSION=${VERSION:-7.1.0_r4} +SRC1=core-75a38b87f3044a48fee359b49766c64a87a34c74.tar.gz +SRC2=extras-614a6c7cf8296302de559ad7bf65d3ebd43ca023.tar.gz +SRC3=libselinux-9d7eba17309e2d8761354e054c8800cf34402549.tar.gz +SRC4=f2fs-tools-5bd943d50d103eb6f48a72f199a49dce4feeb61a.tar.gz BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -47,8 +47,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -84,10 +84,10 @@ tar -xvf $CWD/$SRC4 -C f2fs-tools #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/libselinux #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/f2fs-tools -patch -p1 < $CWD/fix_build.patch +patch -p0 < $CWD/fix_build.patch -# build.sh borrowed from Arch linux -cp -p $CWD/build.sh . +# generate_build.rb borrowed from Arch Linux +ruby $CWD/generate_build.rb > build.sh chown -R root:root . find . \ @@ -101,7 +101,7 @@ find . \ mkdir -p $PKG/usr/bin install -Dm 755 adb $PKG/usr/bin/adb install -Dm 755 fastboot $PKG/usr/bin/fastboot -install -Dm 755 mkbootimg $PKG/usr/bin/mkbootimg +install -Dm 755 core/mkbootimg/mkbootimg $PKG/usr/bin/mkbootimg 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 |