summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD44
2 files changed, 22 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e345eaf2f03..679e720c3420 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 = 6
+ pkgrel = 7
url = https://github.com/facebook/wdt
arch = i686
arch = x86_64
@@ -17,7 +17,9 @@ pkgbase = wdt
depends = google-glog
depends = openssl-1.0
optdepends = jemalloc
- source = git+https://github.com/facebook/wdt.git
+ source = git+https://github.com/facebook/wdt.git#tag=v1.27.1612021
+ source = git+https://github.com/facebook/folly.git#tag=v2017.04.10.00
+ sha256sums = SKIP
sha256sums = SKIP
pkgname = wdt
diff --git a/PKGBUILD b/PKGBUILD
index 76bdc3be3566..eb0ff4801e8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=wdt
pkgver=1.27.1612021
-pkgrel=6
+pkgrel=7
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"
@@ -11,45 +11,37 @@ depends=('glibc' 'bash' 'double-conversion' 'gflags' 'google-glog' 'openssl-1.0'
makedepends=('git' 'cmake' 'boost')
optdepends=('jemalloc')
checkdepends=('gtest')
-source=("git+https://github.com/facebook/wdt.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/facebook/wdt.git#tag=v$pkgver"
+ "git+https://github.com/facebook/folly.git#tag=v2017.04.10.00")
+sha256sums=('SKIP'
+ 'SKIP')
-prepare() {
- cd "$srcdir"
-
- rm -rf "folly"
- git clone "https://github.com/facebook/folly.git"
- cd "folly"
- #git checkout "$(git describe --abbrev=0 --always)"
- git checkout "tags/v2017.04.10.00"
-
- cd "$srcdir/wdt"
- git checkout "tags/v$pkgver"
- mkdir -p "_build"
-}
-
build() {
- cd "$srcdir/wdt/_build"
+ cd "wdt"
- cmake -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE=Release \
+ cmake \
+ -B "_build" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
-DOPENSSL_INCLUDE_DIR="/usr/include/openssl-1.0" \
-DOPENSSL_SSL_LIBRARY="/usr/lib/openssl-1.0/libssl.so" \
-DOPENSSL_CRYPTO_LIBRARY="/usr/lib/openssl-1.0/libcrypto.so" \
- ../
+ ./
# -DBUILD_TESTING=on
- make
+ make -C "_build"
}
check() {
- cd "$srcdir/wdt/_build"
+ cd "wdt"
- #CTEST_OUTPUT_ON_FAILURE=1 make test
+ #CTEST_OUTPUT_ON_FAILURE=1 make -C "_build" test
}
package() {
- cd "$srcdir/wdt/_build"
+ cd "wdt"
- make DESTDIR="$pkgdir" install
- install -Dm644 "../LICENSE" "$pkgdir/usr/share/licenses/wdt/LICENSE"
+ make -C "_build" DESTDIR="$pkgdir" install
+ install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/wdt"
}