diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | no_submodule_init.patch | 2 | ||||
| -rw-r--r-- | readies.patch | 20 |
5 files changed, 41 insertions, 10 deletions
@@ -1,13 +1,15 @@ pkgbase = redis-timeseries pkgdesc = Time Series data structure for Redis pkgver = 1.8.3 - pkgrel = 1 + pkgrel = 2 url = https://redis.io/docs/stack/timeseries/ arch = x86_64 license = custom:RSALv2 license = custom:SSPLv1 makedepends = git makedepends = lcov + makedepends = python + makedepends = cmake depends = redis source = git+https://github.com/RedisTimeSeries/RedisTimeSeries.git#commit=26a2e426ba7b1fa80e9709d73e28d4a067f39900 source = git+https://github.com/RedisLabsModules/readies.git @@ -18,6 +20,7 @@ pkgbase = redis-timeseries source = git+https://github.com/redis/hiredis.git source = git+https://github.com/libevent/libevent.git source = no_submodule_init.patch + source = readies.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -26,6 +29,7 @@ pkgbase = redis-timeseries sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = db2839d9b4c67a40d35af1afb9e9e9058a932469f38e8a048667879e0c107dbf + sha256sums = 2fd78c5f453aa30aa9df71bf8c34ad5add7368086b50cfbfafa1adec1e2659a4 + sha256sums = fb3fed48d6db9510f8830bd87bb30678c9061054e1aa7c5e8bbc480e13858d3a pkgname = redis-timeseries diff --git a/.gitignore b/.gitignore index a7ced579150b..d19c2cdcf091 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ readies/ RedisModulesSDK/ RedisTimeSeries/ src/ +*.log @@ -2,7 +2,7 @@ pkgname=redis-timeseries _commit_hash=26a2e426ba7b1fa80e9709d73e28d4a067f39900 # v1.8.3 tag pkgver=1.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Time Series data structure for Redis" arch=(x86_64) url="https://redis.io/docs/stack/timeseries/" @@ -13,6 +13,8 @@ redis makedepends=( git lcov +python +cmake ) source=( @@ -25,6 +27,7 @@ git+https://github.com/RedisGears/LibMR.git git+https://github.com/redis/hiredis.git git+https://github.com/libevent/libevent.git no_submodule_init.patch +readies.patch ) sha256sums=('SKIP' @@ -35,7 +38,8 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'db2839d9b4c67a40d35af1afb9e9e9058a932469f38e8a048667879e0c107dbf') + '2fd78c5f453aa30aa9df71bf8c34ad5add7368086b50cfbfafa1adec1e2659a4' + 'fb3fed48d6db9510f8830bd87bb30678c9061054e1aa7c5e8bbc480e13858d3a') pkgver() { cd RedisTimeSeries @@ -46,14 +50,19 @@ prepare() { cd RedisTimeSeries git submodule init + _sm=readies git config submodule.deps/${_sm}.url "${srcdir}/${_sm}" + _sm=fast_double_parser git config submodule.deps/${_sm}.url "${srcdir}/${_sm}" + _sm=cpu_features git config submodule.deps/${_sm}.url "${srcdir}/${_sm}" + _sm=RedisModulesSDK git config submodule.deps/${_sm}.url "${srcdir}/${_sm}" + _sm=LibMR git config submodule.deps/${_sm}.url "${srcdir}/${_sm}" #git -c protocol.file.allow=always submodule update @@ -67,14 +76,13 @@ prepare() { git submodule--helper update -q # use the submodule commit hashes specified popd - # don't let the build script fetch - cat ../no_submodule_init.patch | patch -p1 + # prevent auto submodule fetch + cat ../no_submodule_init.patch | patch -p1 + cat ../readies.patch | patch -p1 } build() { cd RedisTimeSeries - - #./configure --prefix=/usr make build } diff --git a/no_submodule_init.patch b/no_submodule_init.patch index b9f4169946bb..cc31df8a8589 100644 --- a/no_submodule_init.patch +++ b/no_submodule_init.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index aeac6c06..56fb8985 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,6 @@ ROOT=. diff --git a/readies.patch b/readies.patch new file mode 100644 index 000000000000..0775f8ce066c --- /dev/null +++ b/readies.patch @@ -0,0 +1,20 @@ +--- a/deps/readies/mk/main ++++ b/deps/readies/mk/main +@@ -29,16 +29,12 @@ $(error Cannot find readies root) + endif + endif + +-ifeq ($(wildcard $(READIES)/*),) +-___:=$(shell git submodule update --init --recursive &> /dev/null) +-endif +- + MK:=$(READIES)/mk + + MK.pyver ?= 3 + MK.getpy=getpy$(MK.pyver) + +-ifneq ($(shell { CHECK=1 $(READIES)/bin/$(MK.getpy); echo -n $$?; }),0) ++ifneq (0,0) + ifneq ($(filter setup,$(MAKECMDGOALS)),) + MK.nobindir:=1 + else |