summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaichi Shinozaki2017-03-23 07:08:25 +0000
committerDaichi Shinozaki2017-03-23 07:08:25 +0000
commit18ead199c1895cbedbd5f83b3e25f43f22292208 (patch)
treeb2661eb69c8f7414e0196e769c58d9e7190c93b3
parent8f6f0e0da263b4f4b9a69a373c770eb386f52e13 (diff)
downloadaur-18ead199c1895cbedbd5f83b3e25f43f22292208.tar.gz
Bump version to 2017.03.20
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD37
2 files changed, 13 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f3449ee6b53..55dcc4bd9129 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
# Generated by mksrcinfo v8
-# Sun Dec 27 21:51:03 UTC 2015
+# Thu Mar 23 07:08:05 UTC 2017
pkgbase = fbthrift
pkgdesc = Facebook's branch of Apache Thrift, including a new C++ server
- pkgver = 0.31.0
+ pkgver = 2017.03.20.00
pkgrel = 1
url = https://github.com/facebook/fbthrift
arch = i686
arch = x86_64
license = Apache
makedepends = scons
+ makedepends = zstd
depends = folly
depends = krb5
depends = numactl
@@ -17,18 +18,8 @@ pkgbase = fbthrift
conflicts = thrift
options = !emptydirs
options = staticlibs
- source = https://github.com/facebook/fbthrift/archive/v0.31.0.tar.gz
- source = BinaryProtocol.h.patch
- source = CompactProtocol.h.patch
- source = Serializer.h.patch
- source = Krb5CredentialsCacheManager.cpp.patch
- source = GeneratedCodeHelper.h.patch
- md5sums = 80d180ea65b03c7f68834159ab45a7ae
- md5sums = 5a410a5ffdd4813f9844c06b37cdd048
- md5sums = 067b4fc38a9e73cc06bd8d29eeb95c4f
- md5sums = ae028ff57127ee3f3c44b5b592b09199
- md5sums = bda963346b5171e59bacc0034868fa63
- md5sums = 15166953d352fdf64c1009a5b7dbdc6c
+ source = https://github.com/facebook/fbthrift/archive/v2017.03.20.00.tar.gz
+ md5sums = eb8b04def043e4b897e5ce1617695486
pkgname = fbthrift
diff --git a/PKGBUILD b/PKGBUILD
index 13910ae92b0f..52e93d72a20f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Daichi Shinozaki <dsdseg@gmail.com>
pkgname=fbthrift
-pkgver=0.31.0
+pkgver=2017.03.20.00
pkgrel=1
pkgdesc="Facebook's branch of Apache Thrift, including a new C++ server"
arch=('i686' 'x86_64')
@@ -9,34 +9,13 @@ license=('Apache')
depends=('folly' 'krb5' 'numactl' 'python2')
conflicts=('thrift')
provides=('thrift')
-makedepends=('scons')
+makedepends=('scons' 'zstd')
options=('!emptydirs' 'staticlibs')
-source=("https://github.com/facebook/$pkgname/archive/v${pkgver}.tar.gz"
-'BinaryProtocol.h.patch'
-'CompactProtocol.h.patch'
-'Serializer.h.patch'
-'Krb5CredentialsCacheManager.cpp.patch'
-#'t_rb_generator.cc.patch'
-'GeneratedCodeHelper.h.patch'
-)
-md5sums=('80d180ea65b03c7f68834159ab45a7ae'
- '5a410a5ffdd4813f9844c06b37cdd048'
- '067b4fc38a9e73cc06bd8d29eeb95c4f'
- 'ae028ff57127ee3f3c44b5b592b09199'
- 'bda963346b5171e59bacc0034868fa63'
- '15166953d352fdf64c1009a5b7dbdc6c')
+source=("https://github.com/facebook/$pkgname/archive/v${pkgver}.tar.gz")
+md5sums=('eb8b04def043e4b897e5ce1617695486')
prepare() {
cd "$pkgname-$pkgver/thrift"
- patch -p2 --verbose < $srcdir/BinaryProtocol.h.patch
- patch -p2 --verbose < $srcdir/CompactProtocol.h.patch
- patch -p2 --verbose < $srcdir/Serializer.h.patch
- patch -p2 --verbose < $srcdir/Krb5CredentialsCacheManager.cpp.patch
-# patch -p2 --verbose < $srcdir/t_rb_generator.cc.patch
- cd lib/cpp2
- patch -p0 --verbose < $srcdir/GeneratedCodeHelper.h.patch
- cd ../../
-
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
@@ -45,15 +24,15 @@ prepare() {
}
build() {
- cd "$pkgname-$pkgver/thrift"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+ 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
}
#check() {
-# cd "$pkgname-$pkgver/$pkgname"
-# make check
+# cd "$pkgname-$pkgver/thrift"
+# make check
#}
package() {