From e3c1a8243dabd9b2083767d2d0668e1cc0ec33da Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 23 Mar 2023 10:56:48 +0100 Subject: [PATCH 1/2] fix: Makefile rocksdb (#15422) Co-authored-by: Marko (cherry picked from commit 67dc594888c63f037a34f324c9b9c6d2a2dcfc6b) # Conflicts: # Makefile --- Makefile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8de4eb33af80..afab9120287f 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,13 @@ HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) +<<<<<<< HEAD DOCS_DOMAIN=docs.cosmos.network # 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 +======= +>>>>>>> 67dc59488 (fix: Makefile rocksdb (#15422)) export GO111MODULE = on @@ -59,6 +62,7 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags)) # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ +<<<<<<< HEAD -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) \ @@ -71,25 +75,30 @@ ifeq ($(ENABLE_ROCKSDB),true) else $(warning RocksDB support is disabled; to build and test with RocksDB support, set ENABLE_ROCKSDB=true) endif +======= + -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) + +>>>>>>> 67dc59488 (fix: Makefile rocksdb (#15422)) # DB backend selection 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))) - ifneq ($(ENABLE_ROCKSDB),true) - $(error Cannot use RocksDB backend unless ENABLE_ROCKSDB=true) - endif CGO_ENABLED=1 - BUILD_TAGS += rocksdb + 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 9c7597e06ca6d38157c08ede4c4b1947b163f683 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 23 Mar 2023 11:18:58 +0100 Subject: [PATCH 2/2] conflicts --- Makefile | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Makefile b/Makefile index afab9120287f..88ad979ffad0 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,7 @@ HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) -<<<<<<< HEAD DOCS_DOMAIN=docs.cosmos.network -# 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 -======= ->>>>>>> 67dc59488 (fix: Makefile rocksdb (#15422)) export GO111MODULE = on @@ -62,27 +56,11 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags)) # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ -<<<<<<< HEAD -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/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION) - -ifeq ($(ENABLE_ROCKSDB),true) - BUILD_TAGS += rocksdb_build - test_tags += rocksdb_build -else - $(warning RocksDB support is disabled; to build and test with RocksDB support, set ENABLE_ROCKSDB=true) -endif -======= - -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) - ->>>>>>> 67dc59488 (fix: Makefile rocksdb (#15422)) + -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION) # DB backend selection ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))