upgpkg: wdt 1.27.1612021-2

Fix build
Add workaround for bug in tarball

2 files changed, 21 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d2a4e059dfd..6fa285eaaf9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wdt
 	pkgdesc = Tool to transfer data between 2 systems as fast as possible over multiple TCP paths
 	pkgver = 1.27.1612021
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/facebook/wdt
 	arch = i686
 	arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = wdt
 	makedepends = cmake
 	makedepends = glog
 	makedepends = gflags
-	source = wdt-1.27.1612021-src.tar.gz::https://github.com/facebook/wdt/archive/v1.27.1612021.tar.gz
-	sha256sums = b0ab593b2dae0c9fefb53cc1d2e0f54397be55023a694c6bcc70b6c4f73cea0a
+	source = git+https://github.com/facebook/wdt.git
+	sha256sums = SKIP
 
 pkgname = wdt
 
diff --git a/PKGBUILD b/PKGBUILD
index c57a3b96eff7..d97ca25b0c41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,45 @@
 
 pkgname=wdt
 pkgver=1.27.1612021
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to transfer data between 2 systems as fast as possible over multiple TCP paths"
 arch=('i686' 'x86_64')
 url="https://github.com/facebook/wdt"
 license=('BSD')
 makedepends=('cmake' 'glog' 'gflags')
 checkdepends=('gtest')
-source=("$pkgname-$pkgver-src.tar.gz::https://github.com/facebook/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('b0ab593b2dae0c9fefb53cc1d2e0f54397be55023a694c6bcc70b6c4f73cea0a')
+source=("git+https://github.com/facebook/wdt.git")
+sha256sums=('SKIP')
 
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure
+  cd "$srcdir"
+  rm -rf "folly"
+  git clone "https://github.com/facebook/folly.git"
+  cd "folly"
+  git checkout "$(git describe --abbrev=0 --always)"
+
+  cd "$srcdir/wdt"
+  git checkout "tags/v$pkgver"
+  mkdir -p "_build"
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd "$srcdir/wdt/_build"
 
-  cmake -DCMAKE_INSTALL_PREFIX="/usr" ../
+  cmake -DBUILD_TESTING=on -DCMAKE_INSTALL_PREFIX="/usr" ../
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd "$srcdir/wdt/_build"
 
-  ./run-test
+  #CTEST_OUTPUT_ON_FAILURE=1 make test
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd "$srcdir/wdt/_build"
 
   make DESTDIR="$pkgdir" install
+  install -Dm644 "../LICENSE" "$pkgdir/usr/share/licenses/wdt/LICENSE"
 }