Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(858)

Unified Diff: ports/libgit2/build.sh

Issue 544893003: Update libgit2 version from 0.20.0 to 0.21.1 (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build_tools/XCompile-nacl.cmake ('k') | ports/libgit2/nacl.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/libgit2/build.sh
diff --git a/ports/libgit2/build.sh b/ports/libgit2/build.sh
index 8adccde451ddfa382f3ef99f3c33fe4f6fef98df..fa2023223a5c7589a5f368abf195ed0f9e31db8b 100644
--- a/ports/libgit2/build.sh
+++ b/ports/libgit2/build.sh
@@ -2,7 +2,20 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-if [ "${NACL_LIBC}" = "newlib" ]; then
+EXECUTABLES="libgit2_clar"
+
+if [ "${NACL_SHARED}" != "1" ]; then
EXTRA_CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF"
- NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
+fi
+
+if [ "${NACL_LIBC}" = "newlib" ]; then
+ NACLPORTS_CPPFLAGS="-I${NACLPORTS_INCLUDE}/glibc-compat"
+ # newlib headers generate a lot of char-subscript warnings
+ # for macros such as tolower()
+ NACLPORTS_CPPFLAGS+=" -Wno-char-subscripts"
+ if [ "$NACL_ARCH" != "arm" ]; then
+ # Our x86 version of gcc generates a lot of strict aliasing
+ # warnings.
+ NACLPORTS_CPPFLAGS+=" -fno-strict-aliasing"
+ fi
fi
« no previous file with comments | « build_tools/XCompile-nacl.cmake ('k') | ports/libgit2/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698