fix building syncthing and fzf

diff --git a/packages/fzf/Makefile.patch b/packages/fzf/Makefile.patch
index 864d110a505142e0a70f7e2c35d3525017a1b59a..0889a479f7c7c77168056464f537703136a607f2 100644 (file)
--- a/packages/fzf/Makefile.patch
+++ b/packages/fzf/Makefile.patch
@@ -1,12 +1,11 @@
-diff -u -r ../fzf-0.16.8/Makefile ./Makefile
---- ../fzf-0.16.8/Makefile     2017-06-05 16:21:50.000000000 +0200
-+++ ./Makefile 2017-07-10 10:00:29.145783026 +0200
+--- ../cache/fzf-0.17.3/Makefile       2017-12-03 14:55:24.000000000 +0000
++++ ./Makefile 2018-02-24 00:04:59.992543575 +0000

 @@ -99,7 +99,7 @@
        ln -sf $(ROOT_DIR)/vendor $(VENDOR_LINK)
  
  vendor: $(GLIDE_YAML)
 -      go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@
 @@ -99,7 +99,7 @@
        ln -sf $(ROOT_DIR)/vendor $(VENDOR_LINK)
  
  vendor: $(GLIDE_YAML)
 -      go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@

-+      GOOS= GOARCH= CGO_ENABLED= go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@
++      GOOS= CC= GOARCH= CGO_ENABLED= go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@

  
  test: $(SOURCES) vendor
        SHELL=/bin/sh GOOS= go test -v -tags "$(TAGS)" \
  
  test: $(SOURCES) vendor
        SHELL=/bin/sh GOOS= go test -v -tags "$(TAGS)" \

diff --git a/packages/syncthing/build.sh b/packages/syncthing/build.sh
index 46edc45817b2f9234e8e85c879149246e0c1798f..f0d1da436e5889ff5d8941518ae1254de4b5deb8 100644 (file)
--- a/packages/syncthing/build.sh
+++ b/packages/syncthing/build.sh
@@ -21,10 +21,12 @@ termux_step_make(){
 
        # Unset GOARCH so building build.go is works.
        export GO_ARCH=$GOARCH
 
        # Unset GOARCH so building build.go is works.
        export GO_ARCH=$GOARCH

-       unset GOOS GOARCH
-
+       export _CC=$CC
+       unset GOOS GOARCH CC
+       

        # Now file structure is same as go get etc.
        go build build.go
        # Now file structure is same as go get etc.
        go build build.go

+       export CC=$_CC

        ./build -goos android \
                -goarch $GO_ARCH \
                -no-upgrade \
        ./build -goos android \
                -goarch $GO_ARCH \
                -no-upgrade \