diff options
author | Yen Chi Hsuan | 2017-10-16 02:10:47 +0800 |
---|---|---|
committer | Yen Chi Hsuan | 2017-10-16 02:10:47 +0800 |
commit | 6db3bed99686c50fb138f03d3480b41803024474 (patch) | |
tree | 9ac059ea824e0978e3b81f1b216ce01f0beedd9c | |
parent | 81c8840763876409ae3ab21b1b06da82f5ed5c43 (diff) | |
download | aur-6db3bed99686c50fb138f03d3480b41803024474.tar.gz |
Fix building against NDK r15.c
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | no-file-offset-bits-64.patch | 12 |
3 files changed, 30 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = fb-adb-git pkgdesc = A better shell to use in place of adb when connecting to Android devices pkgver = 20170602.r363.b931596 - pkgrel = 5 + pkgrel = 6 url = https://github.com/facebook/fb-adb arch = x86_64 license = GPL3 @@ -10,11 +10,14 @@ pkgbase = fb-adb-git makedepends = android-sdk-build-tools makedepends = android-platform-19 makedepends = android-ndk + makedepends = python depends = android-tools options = !strip options = !buildflags source = git+https://github.com/facebook/fb-adb.git + source = no-file-offset-bits-64.patch sha512sums = SKIP + sha512sums = 17379e48d9a881c2af33d01fa4df5c4969ebe89ffa442809c6215b517a3943b61d2a1b3e7675470282e41e758d464fa8e420b01c6060e3be57704e7469340b87 pkgname = fb-adb-git @@ -6,22 +6,32 @@ _TARGET_API=19 _pkgname=fb-adb pkgname=$_pkgname-git pkgver=20170602.r363.b931596 -pkgrel=5 +pkgrel=6 pkgdesc='A better shell to use in place of adb when connecting to Android devices' url='https://github.com/facebook/fb-adb' license=('GPL3') arch=('x86_64') depends=('android-tools') -makedepends=('git' 'vim' 'android-sdk-build-tools' "android-platform-$_TARGET_API" 'android-ndk') +makedepends=('git' 'vim' 'android-sdk-build-tools' "android-platform-$_TARGET_API" 'android-ndk' 'python') options=('!strip' '!buildflags') -source=("git+$url.git") -sha512sums=('SKIP') +source=("git+$url.git" + 'no-file-offset-bits-64.patch') +sha512sums=('SKIP' + '17379e48d9a881c2af33d01fa4df5c4969ebe89ffa442809c6215b517a3943b61d2a1b3e7675470282e41e758d464fa8e420b01c6060e3be57704e7469340b87') pkgver() { cd $_pkgname printf "%s.r%s.%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd $_pkgname + + patch -Np1 -i ../no-file-offset-bits-64.patch + + autoreconf -ifv +} + build() { # configure cd $_pkgname diff --git a/no-file-offset-bits-64.patch b/no-file-offset-bits-64.patch new file mode 100644 index 000000000000..1bb4f112d44f --- /dev/null +++ b/no-file-offset-bits-64.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 7fd5b70..a95260f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,6 @@ AC_SUBST([PATH]) + AC_USE_SYSTEM_EXTENSIONS + + AC_PROG_CC +-AC_SYS_LARGEFILE + AC_CHECK_SIZEOF([off_t]) + + AC_CHECK_HEADERS([machine/endian.h endian.h features.h]) |