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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 diff --git a/.gitignore b/.gitignore 1 diff --git a/.gitignore b/.gitignore
2 new file mode 100644 2 new file mode 100644
3 --- /dev/null 3 --- /dev/null
4 +++ b/.gitignore 4 +++ b/.gitignore
5 @@ -0,0 +1,2 @@ 5 @@ -0,0 +1,2 @@
6 +*.pyc 6 +*.pyc
7 +/bin 7 +/bin
8 diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_pyt hon.py 8 diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_pyt hon.py
9 --- a/buildtools/wafsamba/samba_python.py 9 --- a/buildtools/wafsamba/samba_python.py
10 +++ b/buildtools/wafsamba/samba_python.py 10 +++ b/buildtools/wafsamba/samba_python.py
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 +++ b/lib/ldb-samba/wscript_build 97 +++ b/lib/ldb-samba/wscript_build
98 @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba', 98 @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
99 source='ldif_handlers.c', 99 source='ldif_handlers.c',
100 autoproto='ldif_handlers_proto.h', 100 autoproto='ldif_handlers_proto.h',
101 public_deps='ldb', 101 public_deps='ldb',
102 - deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb- common SAMDB_SCHEMA tdb pyldb-util errors', 102 - deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb- common SAMDB_SCHEMA tdb pyldb-util errors',
103 + deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb- common SAMDB_SCHEMA tdb errors', 103 + deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb- common SAMDB_SCHEMA tdb errors',
104 private_library=True 104 private_library=True
105 ) 105 )
106 106
107 diff --git a/lib/replace/replace.h b/lib/replace/replace.h
108 --- a/lib/replace/replace.h
109 +++ b/lib/replace/replace.h
110 @@ -904,4 +904,9 @@ void rep_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE (1, 2);
111 #include <sys/atomic.h>
112 #endif
113
114 +/* This is needed for the NaCl port for ARM with glibc */
115 +#ifndef FIONREAD
116 +#define FIONREAD 0x541B
117 +#endif
118 +
119 #endif /* _LIBREPLACE_REPLACE_H */
107 diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h 120 diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h
108 --- a/lib/replace/system/wait.h 121 --- a/lib/replace/system/wait.h
109 +++ b/lib/replace/system/wait.h 122 +++ b/lib/replace/system/wait.h
110 @@ -49,7 +49,7 @@ typedef int sig_atomic_t; 123 @@ -49,7 +49,7 @@ typedef int sig_atomic_t;
111 #endif 124 #endif
112 125
113 #if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4) 126 #if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4)
114 -int rep_waitpid(pid_t pid,int *status,int options) 127 -int rep_waitpid(pid_t pid,int *status,int options)
115 +int rep_waitpid(pid_t pid,int *status,int options); 128 +int rep_waitpid(pid_t pid,int *status,int options);
116 #endif 129 #endif
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 conf.CHECK_CODE(''' 255 conf.CHECK_CODE('''
243 @@ -1402,7 +1403,7 @@ main() { 256 @@ -1402,7 +1403,7 @@ main() {
244 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett ype.h rpc/xdr.h", 257 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett ype.h rpc/xdr.h",
245 define='HAVE_NFS_QUOTAS', 258 define='HAVE_NFS_QUOTAS',
246 msg='for NFS QUOTAS', 259 msg='for NFS QUOTAS',
247 - execute=True, 260 - execute=True,
248 + #execute=True, 261 + #execute=True,
249 local_include=False) 262 local_include=False)
250 263
251 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ 264 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \
265 diff --git a/source4/heimdal/lib/hcrypto/rand-timer.c b/source4/heimdal/lib/hcry pto/rand-timer.c
266 --- a/source4/heimdal/lib/hcrypto/rand-timer.c
267 +++ b/source4/heimdal/lib/hcrypto/rand-timer.c
268 @@ -134,7 +134,8 @@ timer_bytes(unsigned char *outdata, int size)
269 pid = fork();
270 if(pid == -1){
271 signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL);
272 - des_not_rand_data(data, size);
273 + // This is commented out for NaCl build. This function does not exist.
274 + //des_not_rand_data(data, size);
Sam Clegg 2015/12/11 23:24:49 Hmm, any idea why this is an arm only problem?
275 return;
276 }
277 if(pid == 0)
252 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build 278 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
253 --- a/source4/libnet/wscript_build 279 --- a/source4/libnet/wscript_build
254 +++ b/source4/libnet/wscript_build 280 +++ b/source4/libnet/wscript_build
255 @@ -3,7 +3,7 @@ 281 @@ -3,7 +3,7 @@
256 bld.SAMBA_LIBRARY('samba-net', 282 bld.SAMBA_LIBRARY('samba-net',
257 source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join. c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_ samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libne t_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_do main.c libnet_samsync.c', 283 source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join. c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_ samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libne t_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_do main.c libnet_samsync.c',
258 autoproto='libnet_proto.h', 284 autoproto='libnet_proto.h',
259 - public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSY NC LIBTSOCKET', 285 - public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSY NC LIBTSOCKET',
260 + public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser LIBCLI_SAMSYNC LIBTSOC KET', 286 + public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser LIBCLI_SAMSYNC LIBTSOC KET',
261 private_library=True 287 private_library=True
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 conf.SAMBA_CHECK_PERL(mandatory=True) 351 conf.SAMBA_CHECK_PERL(mandatory=True)
326 conf.find_program('xsltproc', var='XSLTPROC') 352 conf.find_program('xsltproc', var='XSLTPROC')
327 353
328 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) 354 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
329 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) 355 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
330 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) 356 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0))
331 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) 357 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
332 358
333 if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: 359 if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
334 # Mac OSX needs to have this and it's also needed that the python is co mpiled with this 360 # Mac OSX needs to have this and it's also needed that the python is co mpiled with this
OLDNEW
« ports/samba/build.sh ('K') | « 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