ports/xorg-server/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/xorg-server/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/xorg-server/build.sh

diff --git a/ports/xorg-server/build.sh b/ports/xorg-server/build.sh

index 43584ff218a780778859880706d31e4fa0952eac..0b687bb53bf87efa9c971f3cb06f9a50908a97b4 100755

--- a/ports/xorg-server/build.sh

+++ b/ports/xorg-server/build.sh

@@ -8,6 +8,7 @@ NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK"

EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT}

+EnableCliMain

EnableGlibcCompat

EXTRA_CONFIGURE_ARGS+=" --disable-glx"

@@ -30,13 +31,9 @@ if [ "${NACL_LIBC}" = "newlib" ]; then

NACLPORTS_CPPFLAGS+=" -Dmain=SDL_main"

-export LIBS="\

-${NACL_CLI_MAIN_LIB} \

--Wl,--undefined=SDL_main \

--Wl,--undefined=nacl_main \

--Wl,--undefined=nacl_startup_untar \

--lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm \

--l${NACL_CXX_LIB}"

+NACLPORTS_LDFLAGS+=" -Wl,--undefined=nacl_startup_untar"

+NACLPORTS_LDFLAGS+=" -Wl,--undefined=SDL_main"

+NACLPORTS_LIBS+=" -lSDLmain -lSDL -lRegal -lglslopt -lppapi_gles2 -lm"

PatchStep() {

DefaultPatchStep

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