ports/python/build.sh - Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ports/python/build.sh

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 2 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

Index: ports/python/build.sh

diff --git a/ports/python/build.sh b/ports/python/build.sh

index 5901f91958d2648f8e42c553b1808841533bbeea..dbefa8ff044e7188c76a26b0847d57e74c45c53b 100644

--- a/ports/python/build.sh

+++ b/ports/python/build.sh

@@ -4,8 +4,6 @@

EXECUTABLES=python${NACL_EXEEXT}

-NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"

# This build relies on certain host binaries and python's configure

# requires us to set --build= as well as --host=.

HOST_BUILD_DIR=${WORK_DIR}/build_host

@@ -38,13 +36,13 @@ ConfigureStep() {

EXTRA_CONFIGURE_ARGS+=" --with-pydebug"

NACLPORTS_LIBS+=" -ltermcap"

- NACLPORTS_LIBS+=" ${NACL_CLI_MAIN_LIB}"

if [ "${NACL_LIBC}" = "newlib" ]; then

# When python builds with wait3/wait4 support it also expects struct rusage

# to have certain fields and newlib lacks.

export ac_cv_func_wait3=no

export ac_cv_func_wait4=no

+ EnableCliMain

EnableGlibcCompat

DefaultConfigureStep

if [ "${NACL_LIBC}" = "newlib" ]; then

« no previous file with comments | « ports/pkg/build.sh ('k') | ports/python3/build.sh » ('j') | no next file with comments »