From e4e1e12c086b5c5d1a0e5a8c813b150bebe3c9cf Mon Sep 17 00:00:00 2001 From: Lane Rettig Date: Mon, 29 May 2023 15:00:28 -0400 Subject: [PATCH 1/3] Fix dyld issue on macOS --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 89170cd..40ecb0d 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,7 @@ REALDEPDIR = $(shell realpath $(DEPDIR)) .PHONY: test test: + DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(REALDEPDIR) \ CGO_CFLAGS="-I$(REALDEPDIR)" \ CGO_LDFLAGS="-L$(REALDEPDIR)" \ LD_LIBRARY_PATH=$(REALDEPDIR) \ From 9a9308f60eb196ef444a79f37d0ee8e4dd0da244 Mon Sep 17 00:00:00 2001 From: Lane Rettig Date: Tue, 30 May 2023 14:10:39 -0400 Subject: [PATCH 2/3] Update Makefile Updating per https://github.com/spacemeshos/spacemesh-sdk/pull/5#discussion_r1210601572 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 40ecb0d..4c40402 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,7 @@ REALDEPDIR = $(shell realpath $(DEPDIR)) .PHONY: test test: - DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(REALDEPDIR) \ CGO_CFLAGS="-I$(REALDEPDIR)" \ - CGO_LDFLAGS="-L$(REALDEPDIR)" \ + CGO_LDFLAGS="-L$(REALDEPDIR) -Wl,-rpath,@loader_path -Wl,-rpath,$(REALDEPDIR)" \ LD_LIBRARY_PATH=$(REALDEPDIR) \ go test -v -count 1 -ldflags "-extldflags \"-L$(REALDEPDIR) -led25519_bip32 -lspacemesh_remote_wallet\"" ./... From b7ad7e82c34d6ce1a56c64bcb18280266f2757f1 Mon Sep 17 00:00:00 2001 From: Lane Rettig Date: Tue, 30 May 2023 14:16:29 -0400 Subject: [PATCH 3/3] Update Makefile Update SDK dependency version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4c40402..7faacc8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Based on https://gist.github.com/trosendal/d4646812a43920bfe94e DEPURL = https://github.com/spacemeshos/spacemesh-sdk/releases/download -DEPTAG = 1.0.1 +DEPTAG = 1.0.3 DEPLIB = spacemesh-sdk DEPDIR = deps