fix(mobile): patch gomobile build import

berty · Oct 15, 2018 · cf0ad13 · cf0ad13
1 parent 0ab93d2
commit cf0ad13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.circleci/docker/gomobile-env-flag.diff b/.circleci/docker/gomobile-env-flag.diff
@@ -1,11 +1,11 @@
 --- env.go
 +++ env.go
 @@ -130,7 +130,7 @@ func envInit() (err error) {
-                        "CXX="+clang+"++",
-                        "CGO_CFLAGS="+cflags+" -arch "+archClang(arch),
-                        "CGO_CXXFLAGS="+cflags+" -arch "+archClang(arch),
--                       "CGO_LDFLAGS="+cflags+" -arch "+archClang(arch),
-+                       "CGO_LDFLAGS="+cflags+" -arch "+archClang(arch)+" "+os.Getenv("CGO_LDFLAGS"),
-                        "CGO_ENABLED=1",
-                )
-                darwinEnv[arch] = env
+			"CXX="+clang+"++",
+			"CGO_CFLAGS="+cflags+" -arch "+archClang(arch),
+			"CGO_CXXFLAGS="+cflags+" -arch "+archClang(arch),
+-			"CGO_LDFLAGS="+cflags+" -arch "+archClang(arch),
++			"CGO_LDFLAGS="+cflags+" -arch "+archClang(arch)+" "+os.Getenv("CGO_LDFLAGS"),
+			"CGO_ENABLED=1",
+		)
+		darwinEnv[arch] = env
diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ lint-editorconfig:
 		! -name '*.gen.graphql' \
 		! -name '*.generated.go' \
 		! -name '*.patch' \
+		! -name '*.diff' \
 		! -name '*.vim' \
 		! -name '.DS_Store' \
 		! -name '.generated' \

diff --git a/client/react-native/gomobile/Makefile b/client/react-native/gomobile/Makefile
@@ -3,6 +3,7 @@ PWD :=			$(shell pwd)
 CORE_PACKAGE :=		$(PWD)/../../../core
 CORE_SOURCES :=		$(shell find $(CORE_PACKAGE) -type f -name "*.go") \
 			$(shell find . -type f -name "*.go")
+BUILD_PATCH_PATH :=	$(PWD)/../../../.circleci/docker
 
 GOPATH ?=		$(HOME)/go
 
@@ -29,10 +30,7 @@ deps-osx:
 .PHONY: deps
 deps:
 	GO111MODULE=off go get golang.org/x/mobile/cmd/gomobile
-	cd $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile \
-		&& (git remote add upstream git@github.com:sfroment/mobile || true) \
-		&& git fetch upstream \
-		&& (git cherry-pick af3c051e0603af005260579c432830164f68933b || true)
+	patch -N ~/go/src/golang.org/x/mobile/cmd/gomobile/env.go $(BUILD_PATCH_PATH)/gomobile-env-flag.diff || true
 	go install golang.org/x/mobile/cmd/gomobile
 	go get -v golang.org/x/mobile/cmd/gobind
 	gomobile init