use git submodule instead of patch

segfault-bilibili · Feb 10, 2022 · 922b411 · 922b411
1 parent 5b6f6b9
commit 922b411
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 218 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gost"]
+	path = gost
+	url = https://github.com/segfault-bilibili/gost.git
diff --git a/build.sh b/build.sh
@@ -3,6 +3,7 @@ NDK_VERSION_IF_MISSING=r23b
 GOST_VERSION=2.11.1
 GOLANG_VERSION=1.17.6
 cd $( cd "$( dirname "$0"  )" && pwd  )
+git submodule update --init --recursive
 if [ ! -e build ]
 then
 mkdir build
@@ -18,13 +19,9 @@ fi
 export PATH=$PWD/go/bin:$PATH
 export GOROOT=$PWD/go
 go version
-if [ ! -e gost ]
+if [ ! -e gost ] && [ -d ../gost ]
 then
-curl "https://github.com/ginuerzh/gost/archive/v$GOST_VERSION.tar.gz" -L | tar -zx || exit $?
-mv gost-$GOST_VERSION gost
-cd gost
-patch -p1 -r . < ../../gost.patch
-cd ..
+mv -v ../gost .
 fi
 IS_NDK_MISSING=true
 if find $ANDROID_NDK_ROOT | grep clang$

diff --git a/gost b/gost
diff --git a/gost.patch b/gost.patch