commit ec812a88794337b1730c89dc50f560e7caf0ddb7
author Greg Hackmann <ghackmann@google.com> Wed Jun 11 15:50:55 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 22:15:14 2014 +0000
tree e874458a603f869d9f53399535d9383dff0864ce
parent ee302efdc39338d649bd42cb2d22ed65481ba6d2
parent 7989f56658ba0ac8b2950f5aa1fae9aa4e4e6cbf

Merge "android: split private zlib into its own library"

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index d25f357..e701904 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -163,6 +163,16 @@
 #
 MY_CFLAGS += -Wall $(GCC_W_NO_MISSING_FIELD_INITIALIZERS)
 
+# When using clang and ccache, disable the spammy warnings about unused
+# parameters during compilation, and re-enable colored output.
+#
+# See http://petereisentraut.blogspot.fr/2011/05/ccache-and-clang.html
+ifneq (,$(filter %ccache,$(MY_CC)))
+  ifneq (,$(filter LLVM,$(shell $(HOST_CC) -v 2>&1)))
+    MY_CFLAGS := -Qunused-arguments -fcolor-diagnostics $(MY_CFLAGS)
+  endif
+endif
+
 # Needed to build block.c on Linux/x86_64.
 MY_CFLAGS += -D_GNU_SOURCE=1
 

distrib/package-release.sh

diff --git a/distrib/package-release.sh b/distrib/package-release.sh
index 2cd8e2c..03bc48a 100755
--- a/distrib/package-release.sh
+++ b/distrib/package-release.sh
@@ -506,7 +506,7 @@
 
     dump "[$PKG_NAME] Creating tarball."
     PKG_FILE=$PKG_DIR/$PKG_PREFIX-$PKG_REVISION-$SYSTEM.tar.bz2
-    (run cd "$TEMP_BUILD_DIR"/$SYSTEM && run tar cf $PKG_FILE $PKG_PREFIX-$PKG_REVISION)
+    (run cd "$TEMP_BUILD_DIR"/$SYSTEM && run tar cjf $PKG_FILE $PKG_PREFIX-$PKG_REVISION)
 done
 
 if [ "$OPT_COPY_PREBUILTS" ]; then