ports/unzip/nacl.patch - Issue 632743004: When patching gcc specs file use existing specs if found

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

Issue 632743004: When patching gcc specs file use existing specs if found (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 6 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 unified diff | Download patch

OLD	NEW
1 diff --git a/fileio.c b/fileio.c	1 diff --git a/fileio.c b/fileio.c

2 index ba0a1d0..1377c2a 100644	2 index ba0a1d0..1377c2a 100644

3 --- a/fileio.c	3 --- a/fileio.c

4 +++ b/fileio.c	4 +++ b/fileio.c

5 @@ -1822,8 +1822,15 @@ time_t dos_to_unix_time(dosdatetime)	5 @@ -1822,8 +1822,15 @@ time_t dos_to_unix_time(dosdatetime)

6 /* tzset was already called at start of process_zipfiles() */	6 /* tzset was already called at start of process_zipfiles() */

7 /* tzset(); / / set `timezone' variable */	7 /* tzset(); / / set `timezone' variable */

8 #ifndef __BEOS__ /* BeOS DR8 has no timezones... */	8 #ifndef __BEOS__ /* BeOS DR8 has no timezones... */

9 + /* TODO(hamaji): remove once this gets fixed:	9 + /* TODO(hamaji): remove once this gets fixed:

10 + * https://code.google.com/p/nativeclient/issues/detail?id=3737	10 + * https://code.google.com/p/nativeclient/issues/detail?id=3737

11 + */	11 + */

12 +#if defined(__native_client__) && !defined(__GLIBC__)	12 +#if defined(__native_client__) && defined(_NEWLIB_VERSION)

13 + m_time += _timezone; /* seconds WEST of GMT: add */	13 + m_time += _timezone; /* seconds WEST of GMT: add */

14 +#else	14 +#else

15 m_time += timezone; /* seconds WEST of GMT: add */	15 m_time += timezone; /* seconds WEST of GMT: add */

16 #endif	16 #endif

17 +#endif	17 +#endif

18 #endif /* ?(BSD \|\| MTS \|\| __GO32__) */	18 #endif /* ?(BSD \|\| MTS \|\| __GO32__) */

19 #endif /* ?WIN32 */	19 #endif /* ?WIN32 */

20 TTrace((stderr, " m_time after timezone = %lu\n", (ulg)m_time));	20 TTrace((stderr, " m_time after timezone = %lu\n", (ulg)m_time));

21 diff --git a/process.c b/process.c	21 diff --git a/process.c b/process.c

22 index 1e9a1e1..f2fcb8b 100644	22 index 1e9a1e1..f2fcb8b 100644

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 +++ b/unix/unxcfg.h	62 +++ b/unix/unxcfg.h

63 @@ -200,7 +200,7 @@ typedef struct stat z_stat;	63 @@ -200,7 +200,7 @@ typedef struct stat z_stat;

64 #if (!defined(NO_LCHOWN) \|\| !defined(NO_LCHMOD))	64 #if (!defined(NO_LCHOWN) \|\| !defined(NO_LCHMOD))

65 # define SET_SYMLINK_ATTRIBS	65 # define SET_SYMLINK_ATTRIBS

66 #endif	66 #endif

67 -#ifdef MTS	67 -#ifdef MTS

68 +#if defined(MTS) \|\| defined(__native_client__)	68 +#if defined(MTS) \|\| defined(__native_client__)

69 # ifdef SET_DIR_ATTRIB	69 # ifdef SET_DIR_ATTRIB

70 # undef SET_DIR_ATTRIB	70 # undef SET_DIR_ATTRIB

71 # endif	71 # endif

OLD	NEW

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