removed invalid option 'z' passed to tar command

internalG · May 30, 2012 · be3e939 · be3e939
1 parent 8833412
commit be3e939
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 15 deletions.
diff --git a/build-droid/build-boost.sh b/build-droid/build-boost.sh
@@ -43,10 +43,10 @@ fi
 
 # Extract source
 rm -rf "${BOOST_SOURCE_NAME}"
-tar zxvf "${BOOST_SOURCE_NAME}.tar.gz"
+tar xvf "${BOOST_SOURCE_NAME}.tar.gz"
 
 pushd "${BOOST_SOURCE_NAME}"
-tar zxvf "${TOPDIR}/build-droid/droid-boost-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-boost-patch.tar.gz"
 
 # Build
 

diff --git a/build-droid/build-bzip2.sh b/build-droid/build-bzip2.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "bzip2-${BZIP2_VERSION}"
-tar zxvf "bzip2-${BZIP2_VERSION}.tar.gz"
+tar xvf "bzip2-${BZIP2_VERSION}.tar.gz"
 cp ${TOPDIR}/build-droid/Makefile.bzip2 bzip2-${BZIP2_VERSION}/Makefile
 
 # Build

diff --git a/build-droid/build-cURL.sh b/build-droid/build-cURL.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "curl-${CURL_VERSION}"
-tar zxvf "curl-${CURL_VERSION}.tar.gz"
+tar xvf "curl-${CURL_VERSION}.tar.gz"
 
 # Build
 pushd "curl-${CURL_VERSION}"
@@ -59,7 +59,11 @@ export CFLAGS="-Os -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include"
 export CXXFLAGS="-Os -pipe -isysroot ${SYSROOT} -I${ROOTDIR}/include"
 
 #./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --enable-ares=${ROOTDIR} --with-libssh2=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-verbose --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-manual --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls
+
 #./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-libssh2=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --disable-manual --disable-verbose
+
+#./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --enable-verbose --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --without-libssh2 --disable-manual
+
 ./configure --host=${ARCH}-android-linux --target=${PLATFORM} --prefix=${ROOTDIR} --with-zlib=${ROOTDIR} --with-ssl=${ROOTDIR} --with-random=/dev/urandom --enable-optimize --enable-nonblocking --disable-ares --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-sspi --disable-ipv6 --disable-soname-bump --without-polarssl --without-gnutls --without-cyassl --without-axtls --without-libssh2 --disable-manual --disable-verbose
 
 # Fix libtool to not create versioned shared libraries

diff --git a/build-droid/build-cares.sh b/build-droid/build-cares.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "c-ares-${CARES_VERSION}"
-tar zxvf "c-ares-${CARES_VERSION}.tar.gz"
+tar xvf "c-ares-${CARES_VERSION}.tar.gz"
 
 # Build
 pushd "c-ares-${CARES_VERSION}"

diff --git a/build-droid/build-expat.sh b/build-droid/build-expat.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "expat-${EXPAT_VERSION}"
-tar zxvf "expat-${EXPAT_VERSION}.tar.gz"
+tar xvf "expat-${EXPAT_VERSION}.tar.gz"
 
 # Build
 pushd "expat-${EXPAT_VERSION}"

diff --git a/build-droid/build-icu.sh b/build-droid/build-icu.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "icu"
-tar zxvf "icu4c-${ICU_VERSION//./_}-src.tgz"
+tar xvf "icu4c-${ICU_VERSION//./_}-src.tgz"
 
 # Build
 
@@ -48,7 +48,7 @@ popd
 
 pushd "icu/source"
 
-tar zxvf "${TOPDIR}/build-droid/droid-icu-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-icu-patch.tar.gz"
 
 # Apply patches to icu
 PATCHES_DIR=${TMPDIR}/icu/source/droid-icu-patch

diff --git a/build-droid/build-libgcrypt.sh b/build-droid/build-libgcrypt.sh
@@ -34,7 +34,11 @@ fi
 
 # Extract source
 rm -rf "libgcrypt-${LIBGCRYPT_VERSION}"
+<<<<<<< HEAD
 tar xvjf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
+=======
+tar xvf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
+>>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgcrypt-${LIBGCRYPT_VERSION}"

diff --git a/build-droid/build-libgpg-error.sh b/build-droid/build-libgpg-error.sh
@@ -34,7 +34,11 @@ fi
 
 # Extract source
 rm -rf "libgpg-error-${LIBGPG_ERROR_VERSION}"
+<<<<<<< HEAD
 tar xvjf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
+=======
+tar xvf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
+>>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgpg-error-${LIBGPG_ERROR_VERSION}"

diff --git a/build-droid/build-libssh2.sh b/build-droid/build-libssh2.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "libssh2-${LIBSSH2_VERSION}"
-tar zxvf "libssh2-${LIBSSH2_VERSION}.tar.gz"
+tar xvf "libssh2-${LIBSSH2_VERSION}.tar.gz"
 
 # Build
 pushd "libssh2-${LIBSSH2_VERSION}"

diff --git a/build-droid/build-openssl.sh b/build-droid/build-openssl.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "openssl-${OPENSSL_VERSION}"
-tar zxvf "openssl-${OPENSSL_VERSION}.tar.gz"
+tar xvf "openssl-${OPENSSL_VERSION}.tar.gz"
 
 # Build
 pushd "openssl-${OPENSSL_VERSION}"

diff --git a/build-droid/build-pion.sh b/build-droid/build-pion.sh
@@ -34,12 +34,12 @@ fi
 
 # Extract source
 rm -fr "pion-net-${PION_VERSION}"
-tar zxvf "pion-net-${PION_VERSION}.tar.gz"
+tar xvf "pion-net-${PION_VERSION}.tar.gz"
 
 # Build
 pushd "pion-net-${PION_VERSION}"
 
-tar zxvf "${TOPDIR}/build-droid/droid-pion-patch.tar.gz"
+tar xvf "${TOPDIR}/build-droid/droid-pion-patch.tar.gz"
 
 # Apply patches to icu
 PATCHES_DIR=${TMPDIR}/pion-net-${PION_VERSION}/droid-pion-patch

diff --git a/build-droid/build-sqlcipher.sh b/build-droid/build-sqlcipher.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf *-sqlcipher-*
-tar zxvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
+tar xvf "sqlcipher-${SQLCIPHER_VERSION}.tar.gz"
 
 # Build
 pushd *-sqlcipher-*

diff --git a/build-droid/build-yajl.sh b/build-droid/build-yajl.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf lloyd-yajl-*
-tar zxvf "yajl-${YAJL_VERSION}.tar.gz"
+tar xvf "yajl-${YAJL_VERSION}.tar.gz"
 
 # Build
 pushd lloyd-yajl-*

diff --git a/build-droid/build-zlib.sh b/build-droid/build-zlib.sh
@@ -34,7 +34,7 @@ fi
 
 # Extract source
 rm -rf "zlib-${ZLIB_VERSION}"
-tar zxvf "zlib-${ZLIB_VERSION}.tar.gz"
+tar xvf "zlib-${ZLIB_VERSION}.tar.gz"
 cp ${TOPDIR}/build-droid/Makefile.zlib zlib-${ZLIB_VERSION}/Makefile.in
 
 # Build