Chromium Code Reviews| Index: ports/samba/nacl.patch |
| diff --git a/ports/samba/nacl.patch b/ports/samba/nacl.patch |
| index 1ab4cc32d5d8beef52ae5332ae6c038dab0c4b39..cd5edd5020fe724bdb61192409652e6cc20c3b6f 100644 |
| --- a/ports/samba/nacl.patch |
| +++ b/ports/samba/nacl.patch |
| @@ -104,6 +104,19 @@ diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build |
| private_library=True |
| ) |
| +diff --git a/lib/replace/replace.h b/lib/replace/replace.h |
| +--- a/lib/replace/replace.h |
| ++++ b/lib/replace/replace.h |
| +@@ -904,4 +904,9 @@ void rep_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2); |
| + #include <sys/atomic.h> |
| + #endif |
| + |
| ++/* This is needed for the NaCl port for ARM with glibc */ |
| ++#ifndef FIONREAD |
| ++#define FIONREAD 0x541B |
| ++#endif |
| ++ |
| + #endif /* _LIBREPLACE_REPLACE_H */ |
| diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h |
| --- a/lib/replace/system/wait.h |
| +++ b/lib/replace/system/wait.h |
| @@ -249,6 +262,19 @@ diff --git a/source3/wscript b/source3/wscript |
| local_include=False) |
| if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ |
| +diff --git a/source4/heimdal/lib/hcrypto/rand-timer.c b/source4/heimdal/lib/hcrypto/rand-timer.c |
| +--- a/source4/heimdal/lib/hcrypto/rand-timer.c |
| ++++ b/source4/heimdal/lib/hcrypto/rand-timer.c |
| +@@ -134,7 +134,8 @@ timer_bytes(unsigned char *outdata, int size) |
| + pid = fork(); |
| + if(pid == -1){ |
| + signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL); |
| +- des_not_rand_data(data, size); |
| ++ // This is commented out for NaCl build. This function does not exist. |
| ++ //des_not_rand_data(data, size); |
|
Sam Clegg
2015/12/11 23:24:49
Hmm, any idea why this is an arm only problem?
|
| + return; |
| + } |
| + if(pid == 0) |
| diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build |
| --- a/source4/libnet/wscript_build |
| +++ b/source4/libnet/wscript_build |