opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-19 18:05:32 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4464 from ipfs/gx/update-badger

Browse Source 
badger: Update to fix i386 windows build
This commit is contained in:
Whyrusleeping
2017-12-16 10:37:13 -08:00
committed by GitHub
parent 73170e552f ddcf5ad9c1
commit ce22b83f24
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ipfs/Rules.mk
View File

@ -2,7 +2,7 @@ include mk/header.mk
IPFS_BIN_$(d) := $(call go-curr-pkg-tgt) IPFS_BIN_$(d) := $(call go-curr-pkg-tgt)
TGT_BIN += $(IPFS_BIN_$(d)) TGT_BIN += $(IPFS_BIN_$(d))
TEST += $(d)-try-build TEST_GO_BUILD += $(d)-try-build
CLEAN += $(IPFS_BIN_$(d)) CLEAN += $(IPFS_BIN_$(d))
PATH := $(realpath $(d)):$(PATH) PATH := $(realpath $(d)):$(PATH)
@ -25,9 +25,9 @@ TRY_BUILD_$(d)=$(addprefix $(d)-try-build-,$(SUPPORTED_PLATFORMS))
$(d)-try-build: $(TRY_BUILD_$(d)) $(d)-try-build: $(TRY_BUILD_$(d))
.PHONY: $(d)-try-build .PHONY: $(d)-try-build
$(TRY_BUILD_$(d)): private PLATFORM = $(subst -, ,$(patsubst $<-try-build-%,%,$@)) $(TRY_BUILD_$(d)): PLATFORM = $(subst -, ,$(patsubst $<-try-build-%,%,$@))
$(TRY_BUILD_$(d)): private GOOS = $(word 1,$(PLATFORM)) $(TRY_BUILD_$(d)): GOOS = $(word 1,$(PLATFORM))
$(TRY_BUILD_$(d)): private GOARCH = $(word 2,$(PLATFORM)) $(TRY_BUILD_$(d)): GOARCH = $(word 2,$(PLATFORM))
$(TRY_BUILD_$(d)): $(d) $$(DEPS_GO) ALWAYS $(TRY_BUILD_$(d)): $(d) $$(DEPS_GO) ALWAYS
GOOS=$(GOOS) GOARCH=$(GOARCH) $(go-try-build) GOOS=$(GOOS) GOARCH=$(GOARCH) $(go-try-build)
.PHONY: $(TRY_BUILD_$(d)) .PHONY: $(TRY_BUILD_$(d))

3
mk/golang.mk
View File

@ -9,6 +9,7 @@ GOTFLAGS ?=
DEPS_GO := DEPS_GO :=
TEST_GO := TEST_GO :=
TEST_GO_BUILD :=
CHECK_GO := CHECK_GO :=
go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/go-ipfs/$(1)) go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/go-ipfs/$(1))
@ -35,7 +36,7 @@ test_go_race: GOTFLAGS += -race
test_go_race: test_go_expensive test_go_race: test_go_expensive
.PHONY: test_go_race .PHONY: test_go_race
test_go_expensive: $$(DEPS_GO) test_go_expensive: $$(TEST_GO_BUILD) $$(DEPS_GO)
$(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) ./... $(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) ./...
.PHONY: test_go_expensive .PHONY: test_go_expensive
TEST_GO += test_go_expensive TEST_GO += test_go_expensive

2
mk/util.mk
View File

@ -9,7 +9,7 @@ else
PATH_SEP :=: PATH_SEP :=:
endif endif
# SUPPORTED_PLATFORM += windows/386 FIXME: #4438 (badger bug) SUPPORTED_PLATFORMS += windows-386
SUPPORTED_PLATFORMS += windows-amd64 SUPPORTED_PLATFORMS += windows-amd64
SUPPORTED_PLATFORMS += linux-arm SUPPORTED_PLATFORMS += linux-arm

4
package.json
View File

@ -470,9 +470,9 @@
}, },
{ {
"author": "magik6k", "author": "magik6k",
"hash": "QmPhe5Agy6FW8nyFXdphtAVPrmmPFN18pCrtpnRzMWa4Vi", "hash": "Qmdin8YL17fL1BC5ej6o9b8es6MBoiQjKVdyxEwJh3HVmf",
"name": "go-ds-badger", "name": "go-ds-badger",
"version": "1.2.0" "version": "1.3.0"
}, },
{ {
"author": "whyrusleeping", "author": "whyrusleeping",

2
repo/fsrepo/datastores.go
View File

@ -16,9 +16,9 @@ import (
ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
mount "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/syncmount" mount "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/syncmount"
badgerds "gx/ipfs/QmPhe5Agy6FW8nyFXdphtAVPrmmPFN18pCrtpnRzMWa4Vi/go-ds-badger"
levelds "gx/ipfs/QmYnCBXxoyoS38vtNQjjpRwZTiUnpuuKpapxMNaDfyQRLf/go-ds-leveldb" levelds "gx/ipfs/QmYnCBXxoyoS38vtNQjjpRwZTiUnpuuKpapxMNaDfyQRLf/go-ds-leveldb"
ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt" ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt"
badgerds "gx/ipfs/Qmdin8YL17fL1BC5ej6o9b8es6MBoiQjKVdyxEwJh3HVmf/go-ds-badger"
) )
// ConfigFromMap creates a new datastore config from a map // ConfigFromMap creates a new datastore config from a map