bump 7.6.0

3 files changed, 42 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce230cd761b3..30e43873b2a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tikv
 	pkgdesc = Distributed transactional key-value database, originally created to complement TiDB
-	pkgver = 5.4.0
+	pkgver = 7.6.0
 	pkgrel = 1
 	url = https://github.com/tikv/tikv
 	arch = x86_64
@@ -10,17 +10,19 @@ pkgbase = tikv
 	makedepends = rustup
 	makedepends = awk
 	makedepends = cmake
-	makedepends = gcc
+	makedepends = gcc12
+	makedepends = gflags
+	makedepends = jemalloc
 	depends = tikv-pd
 	depends = gcc-libs
 	provides = tikv-server
 	backup = etc/tikv/tikv.toml
-	source = tikv-5.4.0.tar.gz::https://github.com/tikv/tikv/archive/v5.4.0.tar.gz
+	source = tikv-7.6.0.tar.gz::https://github.com/tikv/tikv/archive/v7.6.0.tar.gz
 	source = tikv.service
 	source = tikv-sysusers.conf
 	source = tikv-tmpfiles.conf
 	source = tikv.toml
-	sha256sums = 6a5645d517ad687af2cb03252ca02482f078e131593eea689ccade66231be6b5
+	sha256sums = 8d7802fd613ee932d2c4517d27dfcbb6765c0509ed6f837cccbbcc947c59ba6a
 	sha256sums = 870b8eaf83bc0d22b05b0f3a7890660e483cf77bb1d84bc50ad04fb23068cd8c
 	sha256sums = 744b252e29099b0099dc41e30bc3badd33b3d661c7126af8044faa4fc2df8927
 	sha256sums = 935291bac6a216c6f880df9bfaec8900266413bb202ac483e79f291e1f28e9f1
diff --git a/.gitignore b/.gitignore
index 662b32a77fd2..00ffb2a00d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.zst
 *.log
 *.patch
+tmp/
diff --git a/PKGBUILD b/PKGBUILD
index 10168669ae7c..3c5d51827980 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,31 @@
 # Maintainer: Xuanwo <xuanwo@archlinuxcn.org>
-# Maintainer: Allen Zhong <zhongbenli@pingcap.com>
+# Maintainer: Allen Zhong <pdev@zhoal.pw>
 pkgname=tikv
-pkgver=5.4.0
+pkgver=7.6.0
 pkgrel=1
 pkgdesc='Distributed transactional key-value database, originally created to complement TiDB'
-makedepends=('go' 'make' 'rustup' 'awk' 'cmake' 'gcc')
 arch=('x86_64')
 url='https://github.com/tikv/tikv'
 license=('Apache')
 provides=('tikv-server')
 backup=(etc/tikv/tikv.toml)
 depends=('tikv-pd' 'gcc-libs')
+makedepends=(
+    'go'
+    'make'
+    'rustup'
+    'awk'
+    'cmake'
+    'gcc12'
+    'gflags'
+    'jemalloc'
+)
 source=(tikv-${pkgver}.tar.gz::https://github.com/tikv/tikv/archive/v${pkgver}.tar.gz
         tikv.service
         tikv-sysusers.conf
         tikv-tmpfiles.conf
         tikv.toml)
-sha256sums=('6a5645d517ad687af2cb03252ca02482f078e131593eea689ccade66231be6b5'
+sha256sums=('8d7802fd613ee932d2c4517d27dfcbb6765c0509ed6f837cccbbcc947c59ba6a'
             '870b8eaf83bc0d22b05b0f3a7890660e483cf77bb1d84bc50ad04fb23068cd8c'
             '744b252e29099b0099dc41e30bc3badd33b3d661c7126af8044faa4fc2df8927'
             '935291bac6a216c6f880df9bfaec8900266413bb202ac483e79f291e1f28e9f1'
@@ -25,21 +34,39 @@ sha256sums=('6a5645d517ad687af2cb03252ca02482f078e131593eea689ccade66231be6b5'
 prepare() {
     cd tikv-${pkgver}
 
-    rustup component add rustfmt-preview
+    #rustup component add rustfmt-preview
 
     # patch Makefile
     sed -i 's/cargo build/cargo build --locked/g' Makefile
+
+    # Remove all git operations.
+    sed -i '/TIKV_BUILD_GIT_/d' Makefile
+
+
 }
 
 build() {
     cd tikv-${pkgver}
 
-    # Remove all git operations.
-    sed -i '/TIKV_BUILD_GIT_/d' Makefile
-
     export TIKV_BUILD_GIT_HASH=v$pkgver
+    export TIKV_BUILD_GIT_TAG=v$pkgver
     export TIKV_BUILD_GIT_BRANCH=release
 
+    # see: https://github.com/tikv/tikv/issues/16593
+    export CC="gcc-12"
+    export CXX="g++-12"
+
+    # the default config in devtools has some params like "-Wp,-D_GLIBCXX_ASSERTIONS"
+    # in CXXFLAGS which make the build error, so overwrite them with a set of tested
+    # working ones.
+    export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection \
+        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+    export CXXFLAGS="$CFLAGS"
+    export LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+         -Wl,-z,pack-relative-relocs"
+
     make build_dist_release
 }