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

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

index f09f8fd86b17bef412581394fb7d0d732d6c4e88..ef0d6a5b42eafcb29564157ebc196780e571e120 100644

--- a/ports/blackbox/build.sh

+++ b/ports/blackbox/build.sh

@@ -8,12 +8,12 @@ EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}"

EXECUTABLES="src/blackbox util/bsetroot util/bstyleconvert"

-export EXTRA_LIBS+="-liconv \

- -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}"

+NACLPORTS_LIBS+=" -liconv -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau"

-# TODO(bradnelson): Find a better general pattern for this.

-# Repeat these here to include them which checking for X11 and linking libxcb,

-# which references ki_fcntl directly.

-NACLPORTS_LIBS+=" -lnacl_io -pthread"

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

+ # Due to missing sys/ipc.h header

+ EXTRA_CONFIGURE_ARGS+=" --disable-mitshm"

+fi

+EnableCliMain

EnableGlibcCompat

« no previous file with comments | « ports/bison/build.sh ('k') | ports/blackbox/nacl.patch » ('j') | no next file with comments »