diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-31 03:56:50 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-31 03:56:50 +0800 |
| commit | 9424c218627d7fedc6722edd27de9f006e33583e (patch) | |
| tree | eb49e7a501e32bd41a712a25d2286afcd16adf52 | |
| parent | e108639ab77ba8fe4bf03633eb646d98d5c872f5 (diff) | |
| download | dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar.gz dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar.bz2 dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar.lz dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar.xz dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.tar.zst dexon-bls-9424c218627d7fedc6722edd27de9f006e33583e.zip | |
avoid use pkg-config
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | go/bls/bls.go | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5ff0ac4..47b30bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: - gcc - clang before_install: - - sudo apt install -y libgmp-dev pkg-config + - sudo apt install -y libgmp-dev script: - git clone --depth 1 https://github.com/herumi/cybozulib.git - git clone --depth 1 https://github.com/herumi/xbyak.git @@ -66,7 +66,8 @@ test: $(TEST_EXE) @grep -v "ng=0, exception=0" result.txt; if [ $$? -eq 1 ]; then echo "all unit tests succeed"; else exit 1; fi run_go: go/bls/bls.go go/bls/bls_test.go $(BLS_LIB) $(BLS_IF_LIB) - cd go/bls && env PKG_CONFIG_PATH=./ go test -tags $(GO_TAG) . +# cd go/bls && env PKG_CONFIG_PATH=./ go test -tags $(GO_TAG) . + cd go/bls && go test -tags $(GO_TAG) . # cd go/bls && go test -tags $(GO_TAG) -v . clean: diff --git a/go/bls/bls.go b/go/bls/bls.go index 91d5a24..8c34d7e 100644 --- a/go/bls/bls.go +++ b/go/bls/bls.go @@ -1,7 +1,8 @@ package bls /* -#cgo pkg-config: bls +#cgo CFLAGS:-I../../include +#cgo LDFLAGS:-lbls_if -lbls -lmcl -lgmpxx -lstdc++ -lgmp -lcrypto -L../../lib -L../../../mcl/lib #cgo bn256 CFLAGS:-UBLS_MAX_OP_UNIT_SIZE -DBLS_MAX_OP_UNIT_SIZE=4 #cgo bn384 CFLAGS:-UBLS_MAX_OP_UNIT_SIZE -DBLS_MAX_OP_UNIT_SIZE=6 #include <bls/bls_if.h> |