repackage and bump to 2018.09.24.00

1 files changed, 25 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c68fde72df25..b09afcfb2b5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,44 @@
+# Maintainer: Aleksandar Trifunović <akstrfn at gmail dot com>
 # Maintainer: Daichi Shinozaki <dsdseg@gmail.com>
+
 pkgname=fbthrift
-pkgver=2017.03.20.00
-pkgrel=2
-pkgdesc="Facebook's branch of Apache Thrift, including a new C++ server"
+pkgver=2018.09.24.00
+pkgrel=1
+pkgdesc="Facebook's branch of Apache Thrift, including a new C++ server."
 arch=('i686' 'x86_64')
 url="https://github.com/facebook/fbthrift"
 license=('Apache')
-depends=('folly' 'krb5' 'numactl' 'python2')
+depends=('folly' 'krb5' 'numactl' 'gflags' 'google-glog' 'mstch' 'fizz' 'wangle')
 conflicts=('thrift')
 provides=('thrift')
-makedepends=('scons' 'zstd' 'libunwind')
-options=('!emptydirs' 'staticlibs')
-source=("https://github.com/facebook/$pkgname/archive/v${pkgver}.tar.gz")
-md5sums=('eb8b04def043e4b897e5ce1617695486')
+makedepends=('cmake' 'zstd' 'libunwind')
+source=("$url/archive/v${pkgver}.tar.gz")
+sha256sums=('f5964d4860b83bd3809cf06b4b3b129acddcf8ee13c3c805b6f44c907c3e85e8')
 
 prepare() {
-  cd "$pkgname-$pkgver/thrift"
-  sed -ie '1 s/python/python2/' ./compiler/py/main.py
-  # ArchLinux system has both libboost_python.so and libboost3_python.so.
-  # Use python2 for build, so prevent libboost3_python.so to be chosen
-  sed -i -e 's/libboost_python\*.so\*/libboost_python.so\*/' ./m4/ax_boost_python.m4
-  autoreconf -ivf 
+    cd "$pkgname-$pkgver"
+    cmake -H. -B_build \
+        -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+        -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+        -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release
 }
 
 build() {
-  cd "$pkgname-$pkgver/thrift"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  sed --in-place -e 's/python\( -mthrift_compiler.main\)/python2 \1/g' ./lib/cpp2/Makefile
-  make
+    cd "$pkgname-$pkgver"
+    cmake --build _build
 }
 
-#check() {
-#  cd "$pkgname-$pkgver/thrift"
-#  make check
-#}
+# check() {
+#     cd "$pkgname-$pkgver"
+#     cmake --build _build -- test
+# }
 
 package() {
-  cd "$pkgname-$pkgver/thrift"
-  make \
+  cd "$pkgname-$pkgver"
+  cmake --build _build -- \
     PY_INSTALL_HOME="$pkgdir/usr" \
     PY_INSTALL_ARGS="--root '${pkgdir}' --prefix=/usr" \
-    DESTDIR="$pkgdir" \
-    install
+    DESTDIR="$pkgdir" install
 }