Skip to content

Commit

Permalink
[NaCL SDK] Roll naclports revision.
Browse files Browse the repository at this point in the history
Roll naclports 850 -> 954.  This fixes the accidental
include of the supplemental newlib headers in the ports
bundle.

Most of the changes in the range we are pulling in are
unrelated to the ports that we ship.  A lot of them are
build script related and adding of new ports.  The revisions
of interest are:

 949 - Add port of lua 5.2 and use it in lua_ppapi example.
 948 - Fix accidental modification of top level sdklibs target.

The former changes the default lua version from 5.1 to 5.2
which means we will now be shipping liblua 5.2 in the SDK.
The latter removes the accidentally included headers which
actually fixes bug 313403.

R=binji@chromium.org, binji
BUG=313403

Review URL: https://codereview.chromium.org/52713007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232167 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sbc@chromium.org committed Oct 31, 2013
1 parent 012205d commit fe381f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions native_client_sdk/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def CommonChecks(input_api, output_api):
r'src[\\\/]build_tools[\\\/]tests[\\\/].*',
r'src[\\\/]build_tools[\\\/]sdk_tools[\\\/]third_party[\\\/].*',
r'src[\\\/]doc[\\\/]*',
r'src[\\\/]gonacl_appengine[\\\/]*',
]
canned = input_api.canned_checks
output.extend(canned.RunPylint(input_api, output_api, black_list=black_list,
Expand Down
5 changes: 3 additions & 2 deletions native_client_sdk/src/build_tools/build_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')

NACLPORTS_URL = 'https://naclports.googlecode.com/svn/trunk/src'
NACLPORTS_REV = 850
NACLPORTS_REV = 954

GYPBUILD_DIR = 'gypbuild'

Expand Down Expand Up @@ -820,17 +820,18 @@ def BuildStepBuildNaClPorts(pepper_ver, pepperdir):
"""Build selected naclports in all configurations."""
# TODO(sbc): currently naclports doesn't know anything about
# Debug builds so the Debug subfolders are all empty.
bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')

env = dict(os.environ)
env['NACL_SDK_ROOT'] = pepperdir
env['PEPPER_DIR'] = os.path.dirname(pepperdir)
env['NACLPORTS_NO_ANNOTATE'] = "1"
env['NACLPORTS_NO_UPLOAD'] = "1"

build_script = 'build_tools/bots/linux/naclports-linux-sdk-bundle.sh'
buildbot_common.BuildStep('Build naclports')
buildbot_common.Run([build_script], env=env, cwd=NACLPORTS_DIR)

bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')
out_dir = os.path.join(bundle_dir, 'pepper_%s' % pepper_ver)

# Some naclports do not include a standalone LICENSE/COPYING file
Expand Down

0 comments on commit fe381f5

Please sign in to comment.