updpkg: fixed build

2 files changed, 34 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6aefbbe15eb9..13efa43284a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
-# Generated by mksrcinfo v8
-# Wed Mar 28 10:13:50 UTC 2018
 pkgbase = aarch64-linux-gnu-libffi
-	pkgdesc = Portable foreign function interface library
+	pkgdesc = Portable foreign function interface library (ARM64)
 	pkgver = 3.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceware.org/libffi/
-	arch = any
+	arch = x86_64
 	license = MIT
+	makedepends = aarch64-linux-gnu-configure
 	depends = aarch64-linux-gnu-glibc
+	options = !buildflags
 	source = ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
-	sha1sums = 280c265b789e041c02e5c97815793dfc283fb1e6
+	sha256sums = d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37
 
 pkgname = aarch64-linux-gnu-libffi
 
diff --git a/PKGBUILD b/PKGBUILD
index 777ff3db3a27..431270a4396d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,26 @@
-# $Id$
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Tilmann Meyer <tilmann.meyer@gmx.net>
 
 _target=aarch64-linux-gnu
-pkgname=${_target}-libffi
+
 _pkgname=libffi
+pkgname=$_target-$_pkgname
 pkgver=3.2.1
-pkgrel=1
-pkgdesc='Portable foreign function interface library'
-arch=('any')
+pkgrel=2
+pkgdesc='Portable foreign function interface library (ARM64)'
+arch=(x86_64)
 url='http://sourceware.org/libffi/'
-license=('MIT')
-depends=("${_target}-glibc")
-source=(ftp://sourceware.org/pub/libffi/libffi-$pkgver.tar.gz)
-sha1sums=('280c265b789e041c02e5c97815793dfc283fb1e6')
-
-build() {
-  cd $_pkgname-$pkgver
-if [ n != "$RUN_PREPARE" ]; then
-  if [ 1 = "$ccache" ]; then
-    export CC=${CC:-ccache ${_target}-gcc}
-    export CXX=${CXX:-ccache ${_target}-g++}
-  fi
-  unset CFLAGS CXXFLAGS
-  ./configure --prefix=/usr/${_target} --disable-static \
-    --host=${_target} \
-    --enable-pax_emutramp
-fi
-  make
-}
+license=(MIT)
+depends=($_target-glibc)
+makedepends=($_target-configure)
+options=(!buildflags)
+source=(
+  ftp://sourceware.org/pub/libffi/libffi-$pkgver.tar.gz
+)
+sha256sums=(
+  'd06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37'
+)
+
+_srcdir=$_pkgname-$pkgver
 
 strip() {
   ${_target}-strip "$@"
@@ -38,24 +30,19 @@ objcopy() {
   ${_target}-objcopy "$@"
 }
 
-check() {
-  local s readelfarch
-  readelfarch='AArch64'
-  cd $_pkgname-$pkgver
-
-  s=$(find . -type f "(" -name "*.so*" -o -name "*.a" ")" -print0 | \
-    2>/dev/null LC_ALL=C xargs -0 readelf -h | \
-    sed -n -e '/File:/h;/Machine:/{/'"$readelfarch"'/!{H;x;p}}' | head -10)
+build() {
+  cd $_srcdir
 
-  if [ -n "$s" ]; then
-    >&2 echo "some binaries have wrong architecture:"
-    >&2 echo "$s"
-    return 1
-  fi
+  mkdir -p build-$_target && pushd build-$_target
+  $_target-configure --enable-pax_emutramp
+  make
+  popd
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $_srcdir
+
+  pushd build-$_target
   make DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir"/usr/${_target}/share/licenses/$_pkgname/LICENSE
+  popd
 }