diff options
| author | sbc <sbc@chromium.org> | 2014-09-30 09:46:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 16:46:30 +0000 |
| commit | 6dd982c12a7845366d0e108612a452e50e1bd5da (patch) | |
| tree | aafda285fef6ae0b85baa5435b54df63796e08fd /native_client_sdk | |
| parent | 5323fc4ff170a26ae096c0ff1d954d4b74547a55 (diff) | |
| download | chromium_src-6dd982c12a7845366d0e108612a452e50e1bd5da.zip chromium_src-6dd982c12a7845366d0e108612a452e50e1bd5da.tar.gz chromium_src-6dd982c12a7845366d0e108612a452e50e1bd5da.tar.bz2 | |
[NaCl SDK] Update naclports revision used to build gonacl.com examples
This fixed the build of lua and bullet which was
broken by the recent change in PNaCl toolchain
layout.
Review URL: https://codereview.chromium.org/613233002
Cr-Commit-Position: refs/heads/master@{#297436}
Diffstat (limited to 'native_client_sdk')
3 files changed, 9 insertions, 23 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile index 0d436fa..a19a82c 100644 --- a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile +++ b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile @@ -13,7 +13,7 @@ include $(NACL_SDK_ROOT)/tools/common.mk TARGET = NaClAMBullet LIBS = BulletDynamics BulletCollision LinearMath ppapi pthread -USR_INCLUDE=$(NACL_SDK_ROOT)/toolchain/$(OSNAME)_pnacl/usr/local/include +USR_INCLUDE=$(NACL_SDK_ROOT)/toolchain/$(OSNAME)_pnacl/le32-nacl/local/include BULLET_INCLUDE=$(USR_INCLUDE)/bullet CFLAGS = -I$(CURDIR) -I$(BULLET_INCLUDE) diff --git a/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh b/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh index 1bcd12e..ffe1af8 100755 --- a/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/bullet/build.sh @@ -10,8 +10,8 @@ SCRIPT_DIR="$(cd $(dirname $0) && pwd)" cd ${SCRIPT_DIR} OUT_DIR=out -NACLPORTS_URL=https://chromium.googlesource.com/external/naclports -NACLPORTS_SHA=04ba2e1abe8557ef888b653b7a0da974e4734641 +NACLPORTS_URL=https://chromium.googlesource.com/external/naclports.git +NACLPORTS_SHA=99f2417ab1a397735b20ccceaa58ffcc166f3fb1 NACLPORTS_DIR=${OUT_DIR}/naclports NACLAM_URL=https://github.com/johnmccutchan/NaClAMBase NACLAM_DIR=${OUT_DIR}/NaClAMBase diff --git a/native_client_sdk/src/gonacl_appengine/src/lua/build.sh b/native_client_sdk/src/gonacl_appengine/src/lua/build.sh index 15a8e02..b9663b4 100755 --- a/native_client_sdk/src/gonacl_appengine/src/lua/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/lua/build.sh @@ -5,14 +5,13 @@ set -o nounset set -o errexit -set -o xtrace SCRIPT_DIR="$(cd $(dirname $0) && pwd)" cd ${SCRIPT_DIR} OUT_DIR=out -NACLPORTS_URL=http://naclports.googlecode.com/svn/trunk/src -NACLPORTS_REV=1290 +NACLPORTS_URL=https://chromium.googlesource.com/external/naclports.git +NACLPORTS_REV=99f2417ab1a397735b20ccceaa58ffcc166f3fb1 NACLPORTS_DIR=${OUT_DIR}/naclports if [ -z "${NACL_SDK_ROOT:-}" ]; then @@ -37,24 +36,11 @@ LogExecute() { $* } -Clone() { - local url=$1 - local dir=$2 - local sha=$3 - if [ ! -d $dir ]; then - LogExecute git clone $url $dir - else - pushd $dir - LogExecute git fetch origin - popd - fi - - pushd $dir - LogExecute git checkout $sha - popd -} - Banner Cloning naclports +if [ -d ${NACLPORTS_DIR} -a ! -d ${NACLPORTS_DIR}/src/.git ]; then + rm -rf ${NACLPORTS_DIR} +fi + if [ ! -d ${NACLPORTS_DIR} ]; then mkdir -p ${NACLPORTS_DIR} pushd ${NACLPORTS_DIR} |