cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #99 from filecoin-project/deps/sectorbuilder

Browse Source 
switch over to new sector builder library
This commit is contained in:
Whyrusleeping 2019-07-26 15:54:44 -07:00 committed by GitHub
commit 2b511929a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "lib/sectorbuilder"]
path = lib/sectorbuilder
url = https://github.com/filecoin-project/go-sectorbuilder.git
[submodule "extern/go-bls-sigs"] [submodule "extern/go-bls-sigs"]
path = extern/go-bls-sigs path = extern/go-bls-sigs
url = https://github.com/filecoin-project/go-bls-sigs.git url = https://github.com/filecoin-project/go-bls-sigs.git
[submodule "extern/go-sectorbuilder"]
path = extern/go-sectorbuilder
url = https://github.com/filecoin-project/go-sectorbuilder

16
Makefile
View File

@ -1,7 +1,6 @@
all: build all: build
.PHONY: all .PHONY: all
BUILD_DEPS+=lib/sectorbuilder/include/sector_builder_ffi.h
# git modules that need to be loaded # git modules that need to be loaded
MODULES:= MODULES:=
@ -22,13 +21,20 @@ MODULES+=$(BLS_PATH)
BUILD_DEPS+=build/.bls-install BUILD_DEPS+=build/.bls-install
CLEAN+=build/.bls-install CLEAN+=build/.bls-install
SECTOR_BUILDER_PATH:=extern/go-sectorbuilder/
SECTOR_BUILDER_DEPS:=libsector_builder_ffi.a sector_builder_ffi.pc sector_builder_ffi.h
SECTOR_BUILDER_DEPS:=$(addprefix $(SECTOR_BUILDER_PATH),$(SECTOR_BUILDER_DEPS))
lib/sectorbuilder/include/sector_builder_ffi.h: lib/sectorbuilder lib/sectorbuilder/rust-fil-sector-builder $(SECTOR_BUILDER_DEPS): build/.sector-builder-install ;
./lib/sectorbuilder/build.sh
build/.sector-builder-install: $(SECTOR_BUILDER_PATH)
$(MAKE) -C $(SECTOR_BUILDER_PATH) $(SECTOR_BUILDER_DEPS:$(SECTOR_BUILDER_PATH)%=%)
@touch $@ @touch $@
MODULES+=lib/sectorbuilder MODULES+=$(SECTOR_BUILDER_PATH)
MODULES+=lib/sectorbuilder/rust-fil-sector-builder BUILD_DEPS+=build/.sector-builder-install
CLEAN+=build/.sector-builder-install
$(MODULES): build/.update-modules ; $(MODULES): build/.update-modules ;

1
extern/go-sectorbuilder vendored Submodule

@ -0,0 +1 @@
Subproject commit 9b090e700325b1c9a7d3b1556d447897ae039a58

3
go.mod
View File

@ -7,6 +7,7 @@ require (
github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml v0.3.1
github.com/filecoin-project/go-bls-sigs v0.0.0-20190718224239-4bc4b8a7bbf8 github.com/filecoin-project/go-bls-sigs v0.0.0-20190718224239-4bc4b8a7bbf8
github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543 github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543
github.com/filecoin-project/go-sectorbuilder v0.0.0-20190725115349-9b090e700325
github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1
github.com/gorilla/websocket v1.4.0 github.com/gorilla/websocket v1.4.0
github.com/ipfs/go-bitswap v0.1.5 github.com/ipfs/go-bitswap v0.1.5
@ -80,3 +81,5 @@ require (
) )
replace github.com/filecoin-project/go-bls-sigs => ./extern/go-bls-sigs replace github.com/filecoin-project/go-bls-sigs => ./extern/go-bls-sigs
replace github.com/filecoin-project/go-sectorbuilder => ./extern/go-sectorbuilder

1
lib/sectorbuilder

@ -1 +0,0 @@
Subproject commit ff9bb895529ff49f019b69bcb2527df0479b3632