From d11eac698c0b11f1e28eccb63a09b6ebd8bbe6d7 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 3 Jul 2015 14:18:35 +0200 Subject: [PATCH] submodules: turn off compilation warnings for external projects --- .travis.yml | 2 +- prepare.py | 13 +++++++------ submodules/cmake-builder | 2 +- submodules/externals/antlr3 | 2 +- submodules/externals/gsm | 2 +- submodules/externals/polarssl | 2 +- submodules/externals/speex | 2 +- submodules/externals/srtp | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index f722a5fb3..9f9da31ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_install: - brew update 1>/dev/null - brew tap Gui13/linphone - - brew install doxygen nasm yasm optipng imagemagick coreutils intltool ninj antlr3.2 + - brew install doxygen nasm yasm optipng imagemagick coreutils intltool ninja antlr3.2 - brew upgrade cmake - wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl - chmod +x gas-preprocessor.pl diff --git a/prepare.py b/prepare.py index da6508e09..95c8ae48a 100755 --- a/prepare.py +++ b/prepare.py @@ -306,12 +306,12 @@ package-in-list-%: multiarch = "" for arch in platforms[1:]: multiarch += \ - """ if test -f "$${arch}_path"; then \\ - all_paths=`echo $$all_paths $${arch}_path`; \\ - all_archs="$$all_archs,{arch}" ; \\ - else \\ - echo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\ - fi; \\ +"""\tif test -f "$${arch}_path"; then \\ +\t\tall_paths=`echo $$all_paths $${arch}_path`; \\ +\t\tall_archs="$$all_archs,{arch}" ; \\ +\telse \\ +\t\techo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\ +\tfi; \\ """.format(first_arch=platforms[0], arch=arch) makefile = """ archs={archs} @@ -320,6 +320,7 @@ libs_list={libs_list} LINPHONE_IPHONE_VERSION=$(shell git describe --always) .PHONY: all +.SILENT: lipo all: build diff --git a/submodules/cmake-builder b/submodules/cmake-builder index ac431a6e6..a45c1b0ca 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit ac431a6e6aa3679bcca9c868274d01fa9a874b7a +Subproject commit a45c1b0ca6cb3f89fa13dd42f71e0d27e4472b3c diff --git a/submodules/externals/antlr3 b/submodules/externals/antlr3 index 812695383..311b6764e 160000 --- a/submodules/externals/antlr3 +++ b/submodules/externals/antlr3 @@ -1 +1 @@ -Subproject commit 812695383316c7227c06df2b30725a9e5e4a11a0 +Subproject commit 311b6764e3f440db43617296ff856f7ec07bfdef diff --git a/submodules/externals/gsm b/submodules/externals/gsm index 57d904f7f..b6b379963 160000 --- a/submodules/externals/gsm +++ b/submodules/externals/gsm @@ -1 +1 @@ -Subproject commit 57d904f7fdc97e611b4a09ff7753d5d648ff82cd +Subproject commit b6b37996357ae9d9596b8ee227f33744889d895c diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl index ab2f403a3..5e723467b 160000 --- a/submodules/externals/polarssl +++ b/submodules/externals/polarssl @@ -1 +1 @@ -Subproject commit ab2f403a3e0ec91257f0e943129c0eec272f34e8 +Subproject commit 5e723467b44d2d2128eba54bbad3e80d8dbdac05 diff --git a/submodules/externals/speex b/submodules/externals/speex index 415653bfe..6a8d5c8df 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit 415653bfef10b46d5e7bfa3ad70a68976b77e7b5 +Subproject commit 6a8d5c8dff15afb04e1c71be3f7e4e051992494b diff --git a/submodules/externals/srtp b/submodules/externals/srtp index 37448b2ae..4caa4843b 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit 37448b2aebeb5e9bd2d39d3a82f0721123cdd4a2 +Subproject commit 4caa4843b4bfc54be596d309b5d00a81a35e3276