From 2342cbce621230e8bc7b87b2f5c8dd52f358f30d Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 16 Mar 2023 16:27:45 +0100 Subject: [PATCH 1/6] fix: Makefile rocksdb --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 96dfdd054eb3..933fa787f37e 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,8 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) ifeq ($(ENABLE_ROCKSDB),true) - BUILD_TAGS += rocksdb_build - test_tags += rocksdb_build + BUILD_TAGS += rocksdb + test_tags += rocksdb endif # DB backend selection @@ -82,7 +82,6 @@ ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS))) $(error Cannot use RocksDB backend unless ENABLE_ROCKSDB=true) endif CGO_ENABLED=1 - BUILD_TAGS += rocksdb endif # handle boltdb ifeq (boltdb,$(findstring boltdb,$(COSMOS_BUILD_OPTIONS))) From db5c44e455e41cad2b9c51bceaabf0ca2213b607 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 16 Mar 2023 18:45:07 +0100 Subject: [PATCH 2/6] formatting fix --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 933fa787f37e..ab41db51c2cc 100644 --- a/Makefile +++ b/Makefile @@ -58,11 +58,11 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags)) # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ - -X github.com/cosmos/cosmos-sdk/version.AppName=simd \ - -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ - -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ - -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) + -X github.com/cosmos/cosmos-sdk/version.AppName=simd \ + -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ + -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ + -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ + -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) ifeq ($(ENABLE_ROCKSDB),true) BUILD_TAGS += rocksdb From a6c56569bd0b0937980d3789a2997abd4c7280a5 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Fri, 17 Mar 2023 12:00:26 +0100 Subject: [PATCH 3/6] remove unneeded flag --- Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Makefile b/Makefile index ab41db51c2cc..bd22d76c4b22 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,6 @@ MOCKS_DIR = $(CURDIR)/tests/mocks HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git DOCKER := $(shell which docker) PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) -# RocksDB is a native dependency, so we don't assume the library is installed. -# Instead, it must be explicitly enabled and we warn when it is not. -ENABLE_ROCKSDB ?= false # process build tags build_tags = netgo @@ -64,10 +61,6 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) -ifeq ($(ENABLE_ROCKSDB),true) - BUILD_TAGS += rocksdb - test_tags += rocksdb -endif # DB backend selection ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS))) @@ -78,9 +71,6 @@ ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS))) endif # handle rocksdb ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS))) - ifneq ($(ENABLE_ROCKSDB),true) - $(error Cannot use RocksDB backend unless ENABLE_ROCKSDB=true) - endif CGO_ENABLED=1 endif # handle boltdb From 9cba40ec943b84024032ef5e0eec4a988dcd80bb Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Fri, 17 Mar 2023 12:35:20 +0100 Subject: [PATCH 4/6] add it back --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index bd22d76c4b22..179eef65f8f2 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ MOCKS_DIR = $(CURDIR)/tests/mocks HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git DOCKER := $(shell which docker) PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) +BUILD_TAGS += rocksdb # process build tags build_tags = netgo From cb92bbb2ceeff40c321ab0458a682e77de3c524f Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Wed, 22 Mar 2023 09:47:15 +0100 Subject: [PATCH 5/6] remove rocksdb from default build tags and unify usage of build_tags --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c05e32b04251..1721395d2809 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ MOCKS_DIR = $(CURDIR)/tests/mocks HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git DOCKER := $(shell which docker) PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) -BUILD_TAGS += rocksdb # process build tags build_tags = netgo @@ -68,15 +67,16 @@ ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS))) build_tags += gcc endif ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS))) - BUILD_TAGS += badgerdb + build_tags += badgerdb endif # handle rocksdb ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS))) - CGO_ENABLED=1 + CGO_ENABLEDe=1 + build_tags += rocksdb endif # handle boltdb ifeq (boltdb,$(findstring boltdb,$(COSMOS_BUILD_OPTIONS))) - BUILD_TAGS += boltdb + build_tags += boltdb endif ifeq (,$(findstring nostrip,$(COSMOS_BUILD_OPTIONS))) From 6ccbb0e7f5052caee9671c7a800cb23a46853c52 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 23 Mar 2023 10:18:16 +0100 Subject: [PATCH 6/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1721395d2809..523b3d938fb7 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS))) endif # handle rocksdb ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS))) - CGO_ENABLEDe=1 + CGO_ENABLED=1 build_tags += rocksdb endif # handle boltdb