fix android build, fix typo

4 files changed, 15 insertions, 12 deletions

diff --git a/contrib/depends/packages/native_protobuf.mk b/contrib/depends/packages/native_protobuf.mk
index 7bd336b..1973454 100644
--- a/contrib/depends/packages/native_protobuf.mk
+++ b/contrib/depends/packages/native_protobuf.mk
@@ -10,13 +10,16 @@ define $(package)_set_vars
   $(package)_config_opts_linux=--with-pic
 endef
 
-define $(package)_config_cmds
+define $(package)_preprocess_cmds
   cp -f $(BASEDIR)/config.guess config.guess &&\
   cp -f $(BASEDIR)/config.sub config.sub &&\
   cp -f $(BASEDIR)/config.guess third_party/googletest/googletest/build-aux/config.guess &&\
   cp -f $(BASEDIR)/config.sub third_party/googletest/googletest/build-aux/config.sub &&\
   cp -f $(BASEDIR)/config.guess third_party/googletest/googlemock/build-aux/config.guess &&\
-  cp -f $(BASEDIR)/config.sub third_party/googletest/googlemock/build-aux/config.sub &&\
+  cp -f $(BASEDIR)/config.sub third_party/googletest/googlemock/build-aux/config.sub
+endef
+
+define $(package)_config_cmds
   $($(package)_autoconf)
 endef
 
diff --git a/contrib/depends/packages/protobuf.mk b/contrib/depends/packages/protobuf.mk
index 6c2fb0d..72eae00 100644
--- a/contrib/depends/packages/protobuf.mk
+++ b/contrib/depends/packages/protobuf.mk
@@ -14,16 +14,16 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
-  patch -p0 < $($(package)_patch_dir)/visibility.patch
-endef
-
-define $(package)_config_cmds
+  patch -p0 < $($(package)_patch_dir)/visibility.patch && \
   cp -f $(BASEDIR)/config.guess config.guess &&\
   cp -f $(BASEDIR)/config.sub config.sub &&\
   cp -f $(BASEDIR)/config.guess third_party/googletest/googletest/build-aux/config.guess &&\
   cp -f $(BASEDIR)/config.sub third_party/googletest/googletest/build-aux/config.sub &&\
   cp -f $(BASEDIR)/config.guess third_party/googletest/googlemock/build-aux/config.guess &&\
   cp -f $(BASEDIR)/config.sub third_party/googletest/googlemock/build-aux/config.sub &&\
+endef
+
+define $(package)_config_cmds
   $($(package)_autoconf)
 endef
 
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
index 53267b2..d308c68 100644
--- a/contrib/depends/packages/sodium.mk
+++ b/contrib/depends/packages/sodium.mk
@@ -6,19 +6,19 @@ $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e
 $(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch
 
 define $(package)_set_vars
-$(package)_config_env_android=ANDROID_NDK_ROOT="$(host_prefix)/native" PATH="$(host_prefix)/native/bin" CC=clang AR=ar RANLIB=ranlib
+$(package)_config_env_android=ANDROID_NDK_ROOT="$(host_prefix)/native" PATH="${PATH}:$(host_prefix)/native/bin" CC=clang AR=ar RANLIB=ranlib
 $(package)_config_opts=--enable-static --disable-shared --with-pic
 $(package)_config_opts+=--prefix=$(host_prefix)
 endef
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/disable-glibc-getrandom-getentropy.patch &&\
-  patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch
+  patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch &&\
+  cp -f $(BASEDIR)/config.guess build-aux/config.guess &&\
+  cp -f $(BASEDIR)/config.sub build-aux/config.sub
 endef
 
 define $(package)_config_cmds
-  cp -f $(BASEDIR)/config.guess build-aux/config.guess &&\
-  cp -f $(BASEDIR)/config.sub build-aux/config.sub &&\
   $($(package)_autoconf)
 endef
 
diff --git a/contrib/depends/packages/unwind.mk b/contrib/depends/packages/unwind.mk
index c6bec1f..1e51fd1 100644
--- a/contrib/depends/packages/unwind.mk
+++ b/contrib/depends/packages/unwind.mk
@@ -7,11 +7,11 @@ $(package)_patches=fix_obj_order.patch
 
 define $(package)_preprocess_cmds
   patch -p0 < $($(package)_patch_dir)/fix_obj_order.patch
+  cp -f $(BASEDIR)/config.guess config/config.guess &&\
+  cp -f $(BASEDIR)/config.sub config/config.sub
 endef
 
 define $(package)_config_cmds
-  cp -f $(BASEDIR)/config.guess config/config.guess &&\
-  cp -f $(BASEDIR)/config.sub config/config.sub &&\
   $($(package)_autoconf) --disable-shared --enable-static --disable-tests --disable-documentation AR_FLAGS=$($(package)_arflags)
 endef