ports/tk/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/tk/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

« ports/gforth/build.sh ('K') | « ports/thttpd/nacl.patch ('k') | ports/toybox/build.sh » ('j') | ports/toybox/build.sh » ('J')

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 NACL_CONFIGURE_PATH=${SRC_DIR}/unix/configure	5 NACL_CONFIGURE_PATH=${SRC_DIR}/unix/configure

6	6

7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"

8 NACLPORTS_LIBS+=" -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}"	7 NACLPORTS_LIBS+=" -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}"
	binji 2015/10/27 21:52:38 here too here too Sam Clegg 2015/10/28 17:06:31 Done. Show quoted text On 2015/10/27 21:52:38, binji wrote: > here too Done.
9	8

10 EXTRA_CONFIGURE_ARGS+=" --with-tcl=${NACLPORTS_LIBDIR}"	9 EXTRA_CONFIGURE_ARGS+=" --with-tcl=${NACLPORTS_LIBDIR}"

11	10

12 if [ "${NACL_ARCH}" = "pnacl" ]; then	11 if [ "${NACL_ARCH}" = "pnacl" ]; then

13 EXTRA_CONFIGURE_ARGS+=" --disable-load"	12 EXTRA_CONFIGURE_ARGS+=" --disable-load"

14 fi	13 fi

15	14

16 # Disable fallbacks for broken libc's that kick in for	15 # Disable fallbacks for broken libc's that kick in for

17 # cross-compiles since autoconf can't run target binaries.	16 # cross-compiles since autoconf can't run target binaries.

18 # The fallbacks seem to be non-general.	17 # The fallbacks seem to be non-general.

19 export tcl_cv_strtod_buggy=ok	18 export tcl_cv_strtod_buggy=ok

20	19

21 EnableGlibcCompat	20 EnableGlibcCompat

22	21

23 # Ideally we would only add this flag for newlib builds but	22 # Ideally we would only add this flag for newlib builds but

24 # linking of the shared library currently fails because it	23 # linking of the shared library currently fails because it

25 # tries to link libppapi_stub.a which is not built with -fPIC.	24 # tries to link libppapi_stub.a which is not built with -fPIC.

26 EXTRA_CONFIGURE_ARGS+=" --disable-shared"	25 EXTRA_CONFIGURE_ARGS+=" --disable-shared"

OLD	NEW