summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD18
-rw-r--r--no-file-offset-bits-64.patch12
3 files changed, 30 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a0bf80ff6733..810a469a642c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 5292b0ac0aa8..05b3ae1a7b1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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])