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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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, 1 month 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 unified diff | Download patch

OLD	NEW
1 # Copyright (c) 2014 The Native Client Authors. All rights reserved.	1 # Copyright (c) 2014 The Native Client Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 EXTRA_CONFIGURE_ARGS+=" --with-x"	5 EXTRA_CONFIGURE_ARGS+=" --with-x"

6 EXTRA_CONFIGURE_ARGS+=" --x-includes=${NACLPORTS_INCLUDE}"	6 EXTRA_CONFIGURE_ARGS+=" --x-includes=${NACLPORTS_INCLUDE}"

7 EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}"	7 EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}"

8	8

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

10	10

11 export EXTRA_LIBS+="-liconv \	11 NACLPORTS_LIBS+=" -liconv -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau"

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

13	12

14 # TODO(bradnelson): Find a better general pattern for this.	13 if [[ ${NACL_LIBC} == newlib ]]; then

15 # Repeat these here to include them which checking for X11 and linking libxcb,	14 # Due to missing sys/ipc.h header

16 # which references ki_fcntl directly.	15 EXTRA_CONFIGURE_ARGS+=" --disable-mitshm"

17 NACLPORTS_LIBS+=" -lnacl_io -pthread"	16 fi

18	17

	18 EnableCliMain

19 EnableGlibcCompat	19 EnableGlibcCompat

OLD	NEW

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