ports/busybox/nacl.patch - Issue 1418623008: Fix link error with busybox and glibc

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/busybox/nacl.patch

Issue 1418623008: Fix link error with busybox and glibc (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:

OLD	NEW
	(Empty)
1 diff --git a/libbb/appletlib.c b/libbb/appletlib.c

2 --- a/libbb/appletlib.c

3 +++ b/libbb/appletlib.c

4 @@ -772,7 +772,10 @@ void FAST_FUNC run_applet_and_exit(const char name, char *argv)

5

6

7

8 -#if ENABLE_BUILD_LIBBUSYBOX

9 +#if defined(__native_client__)

10 +#include "ppapi_simple/ps_main.h"

11 +int nacl_ppapi_main(int argc UNUSED_PARAM, char **argv)

12 +#elif ENABLE_BUILD_LIBBUSYBOX

13 int lbb_main(char **argv)

14 #else

15 int main(int argc UNUSED_PARAM, char **argv)

16 @@ -828,3 +831,7 @@ int main(int argc UNUSED_PARAM, char **argv)

17 xfunc_die();

18 #endif

19 }

20 +

21 +#if defined(__native_client__)

22 +PPAPI_SIMPLE_REGISTER_MAIN(nacl_ppapi_main)

23 +#endif

OLD	NEW

« no previous file with comments | « ports/busybox/defconfig ('k') | ports/busybox/pkg_info » ('j') | no next file with comments »