ports/coreutils/nacl.patch - Issue 944053002: Disable more ports under nacl-clang

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

Issue 944053002: Disable more ports under nacl-clang (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 10 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 unified diff | Download patch

OLD	NEW
1 diff --git a/Makefile.in b/Makefile.in	1 diff --git a/Makefile.in b/Makefile.in

2 --- a/Makefile.in	2 --- a/Makefile.in

3 +++ b/Makefile.in	3 +++ b/Makefile.in

4 @@ -184,7 +184,7 @@ CPP = @CPP@	4 @@ -184,7 +184,7 @@ CPP = @CPP@

5 CPPFLAGS = @CPPFLAGS@	5 CPPFLAGS = @CPPFLAGS@

6 CYGPATH_W = @CYGPATH_W@	6 CYGPATH_W = @CYGPATH_W@

7 DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@	7 DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@

8 -DEFS = @DEFS@	8 -DEFS = @DEFS@

9 +DEFS = @DEFS@ -Dmain=nacl_main	9 +DEFS = @DEFS@ -Dmain=nacl_main

10 DEPDIR = @DEPDIR@	10 DEPDIR = @DEPDIR@

(...skipping 30 matching lines...) Expand all Loading...
41 fi	41 fi

42	42

43 if test $ac_list_mounted_fs = found; then	43 if test $ac_list_mounted_fs = found; then

44 diff --git a/lib/__fpending.c b/lib/__fpending.c	44 diff --git a/lib/__fpending.c b/lib/__fpending.c

45 --- a/lib/__fpending.c	45 --- a/lib/__fpending.c

46 +++ b/lib/__fpending.c	46 +++ b/lib/__fpending.c

47 @@ -23,8 +23,10 @@	47 @@ -23,8 +23,10 @@

48	48

49 #include "__fpending.h"	49 #include "__fpending.h"

50	50

51 +#if !defined(__pnacl__)	51 +#if !(defined(__native_client__) && defined(__clang__))

52 size_t	52 size_t

53 __fpending (FILE *fp)	53 __fpending (FILE *fp)

54 {	54 {

55 return PENDING_OUTPUT_N_BYTES;	55 return PENDING_OUTPUT_N_BYTES;

56 }	56 }

57 +#endif	57 +#endif

58 diff --git a/lib/getopt.c b/lib/getopt.c	58 diff --git a/lib/getopt.c b/lib/getopt.c

59 --- a/lib/getopt.c	59 --- a/lib/getopt.c

60 +++ b/lib/getopt.c	60 +++ b/lib/getopt.c

61 @@ -51,6 +51,11 @@	61 @@ -51,6 +51,11 @@

(...skipping 398 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
460 +/* Remove static as nacl-glibc declares this function as non-static	460 +/* Remove static as nacl-glibc declares this function as non-static

461 + * function but does not provide the implementation. */	461 + * function but does not provide the implementation. */

462 +#if defined(__native_client__)	462 +#if defined(__native_client__)

463 +int	463 +int

464 +#else	464 +#else

465 static int	465 static int

466 +#endif	466 +#endif

467 eaccess (char const *file, int mode)	467 eaccess (char const *file, int mode)

468 {	468 {

469 static int have_ids;	469 static int have_ids;

OLD	NEW

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