Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(875)

Unified Diff: ports/samba/nacl.patch

Issue 1467623003: Make Samba build with ARM. Currently may not work at runtime though. (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Re-upload Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/samba/cc_shim.sh ('k') | ports/samba/pkg_info » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/samba/nacl.patch
diff --git a/ports/samba/nacl.patch b/ports/samba/nacl.patch
index 8b41033033c119bbcfcf929ecc979cd62e1202d6..907fc47cc03df1635e56a5408d5df1d22ed72f73 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
@@ -330,6 +343,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);
+ 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
« no previous file with comments | « ports/samba/cc_shim.sh ('k') | ports/samba/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698