OVPN3-799 build/deps: make AR and RANLIB more flexible

Make it possible to specify arguments for both.

deps/jsoncpp/build-jsoncpp

@@ -21,12 +21,12 @@ fi
 
 GPP=g++
 LD=ld
-AR=ar
+AR="ar rc"
 RANLIB=ranlib
 [ "$GPP_CMD" ] && GPP=$GPP_CMD
 [ "$LD_CMD" ] && LD=$LD_CMD
-[ "$AR_CMD" ] && AR=$AR_CMD
-[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD
+[ "$AR_CMD" ] && AR="$AR_CMD"
+[ "$RANLIB_CMD" ] && RANLIB="$RANLIB_CMD"
 
 case $PLATFORM in
 android*)
@@ -72,7 +72,7 @@ cd dist
 CMD="$GPP -I. $PLATFORM_FLAGS $CXX_COMPILER_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -c jsoncpp.cpp"
 echo $CMD
 $CMD
-$AR rc $DIST/lib/libjsoncpp.a jsoncpp.o
+$AR $DIST/lib/libjsoncpp.a jsoncpp.o
 $RANLIB $DIST/lib/libjsoncpp.a
 cp -a json $DIST/include/
 exit 0

deps/lz4/build-lz4

@@ -35,12 +35,12 @@ download
 
 CC=cc
 LD=ld
-AR=ar
+AR="ar rc"
 RANLIB=ranlib
 [ "$GCC_CMD" ] && CC=$GCC_CMD
 [ "$LD_CMD" ] && LD=$LD_CMD
-[ "$AR_CMD" ] && AR=$AR_CMD
-[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD
+[ "$AR_CMD" ] && AR="$AR_CMD"
+[ "$RANLIB_CMD" ] && RANLIB="$RANLIB_CMD"
 
 if [ "$NO_WIPE" != "1" ]; then
     rm -rf $LZ4_VERSION
@@ -60,7 +60,7 @@ cd $LZ4_VERSION/lib
 CMD="$CC $PLATFORM_FLAGS $(lto_flags lz4.c) $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -c lz4.c"
 echo $CMD
 $CMD
-$AR rc $DIST/lib/liblz4.a lz4.o
+$AR $DIST/lib/liblz4.a lz4.o
 $RANLIB $DIST/lib/liblz4.a
 cp lz4.h $DIST/include/
 exit 0

deps/mbedtls/build-mbedtls

@@ -72,12 +72,12 @@ echo BUILDING
 # compiler vars
 CC=cc
 LD=ld
-AR=ar
+AR="ar rc"
 RANLIB=ranlib
 [ "$GCC_CMD" ] && CC=$GCC_CMD
 [ "$LD_CMD" ] && LD=$LD_CMD
-[ "$AR_CMD" ] && AR=$AR_CMD
-[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD
+[ "$AR_CMD" ] && AR="$AR_CMD"
+[ "$RANLIB_CMD" ] && RANLIB="$RANLIB_CMD"
 
 # build it
 SRC=$(pwd)
@@ -93,7 +93,7 @@ done
 # create archive
 cd $DIST
 mkdir library
-$AR rc library/libmbedtls.a $SRC/library/*.o
+$AR library/libmbedtls.a $SRC/library/*.o
 $RANLIB library/libmbedtls.a 2>&1 | grep -v "has no symbols" || true
 
 # copy headers

deps/openssl/build-openssl

@@ -44,10 +44,10 @@ CSUM=${OPENSSL_CSUM}
 
 download
 
-AR=ar
+AR="ar rc"
 RANLIB=ranlib
-[ "$AR_CMD" ] && AR=$AR_CMD
-[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD
+[ "$AR_CMD" ] && AR="$AR_CMD"
+[ "$RANLIB_CMD" ] && RANLIB="$RANLIB_CMD"
 
 # special hack because OpenSSL build system doesn't use rc options for ar
 [ "$AR" = "gcc-ar" ] && AR="gcc-ar rc"
@@ -66,7 +66,7 @@ $CMD
 $mysed -e "s|-O3|$LIB_OPT_LEVEL $MIN_DEPLOY_TARGET $OTHER_COMPILER_FLAGS $LIB_FPIC|" Makefile
 #$mysed -e "s|ERR_load_COMP_strings()|//ERR_load_COMP_strings()|" crypto/err/err_all.c
 make depend
-make CC="$GCC_CMD" AR="$AR" RANLIB="$RANLIB" -j ${MAKE_JOBS:-1} build_libs
+make CC="$GCC_CMD" AR="$AR" ARFLAGS="" RANLIB="$RANLIB" -j ${MAKE_JOBS:-1} build_libs
 touch apps/openssl
 touch openssl.pc
 touch libcrypto.pc

vars/vars-linux

@@ -13,5 +13,5 @@ export LIB_OPT_LEVEL="-O3"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=g++
 export GCC_CMD=gcc
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib

vars/vars-linux-clang

@@ -8,5 +8,5 @@ export LIB_OPT_LEVEL="-O3"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=clang++
 export GCC_CMD=clang
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib

vars/vars-linux-clang-dbg

@@ -8,5 +8,5 @@ export LIB_OPT_LEVEL="-O0"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=clang++
 export GCC_CMD=clang
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib

vars/vars-linux-dbg

@@ -8,5 +8,5 @@ export LIB_OPT_LEVEL="-O0"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=g++
 export GCC_CMD=gcc
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib

vars/vars-linux-libcpp

@@ -8,5 +8,5 @@ export LIB_OPT_LEVEL="-O3"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=clang++
 export GCC_CMD=clang
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib

vars/vars-linux-libcpp-dbg

@@ -8,5 +8,5 @@ export LIB_OPT_LEVEL="-O0"
 export LIB_FPIC="-fPIC"
 export GPP_CMD=clang++
 export GCC_CMD=clang
-export AR_CMD=gcc-ar
+export AR_CMD="gcc-ar rc"
 export RANLIB_CMD=gcc-ranlib