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

Side by Side Diff: ports/samba/nacl.patch

Issue 1456633004: Enable glibc/arm build of samba Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « ports/samba/cc_shim.sh ('k') | ports/samba/pkg_info » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 conf.CHECK_CODE(''' 242 conf.CHECK_CODE('''
243 @@ -1402,7 +1403,7 @@ main() { 243 @@ -1402,7 +1403,7 @@ main() {
244 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett ype.h rpc/xdr.h", 244 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett ype.h rpc/xdr.h",
245 define='HAVE_NFS_QUOTAS', 245 define='HAVE_NFS_QUOTAS',
246 msg='for NFS QUOTAS', 246 msg='for NFS QUOTAS',
247 - execute=True, 247 - execute=True,
248 + #execute=True, 248 + #execute=True,
249 local_include=False) 249 local_include=False)
250 250
251 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ 251 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \
252 diff --git a/source4/heimdal/lib/hcrypto/rand-timer.c b/source4/heimdal/lib/hcry pto/rand-timer.c
253 --- a/source4/heimdal/lib/hcrypto/rand-timer.c
254 +++ b/source4/heimdal/lib/hcrypto/rand-timer.c
255 @@ -134,7 +134,7 @@ timer_bytes(unsigned char *outdata, int size)
256 pid = fork();
257 if(pid == -1){
258 signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL);
259 - des_not_rand_data(data, size);
260 + //des_not_rand_data(data, size);
261 return;
262 }
263 if(pid == 0)
252 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build 264 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
253 --- a/source4/libnet/wscript_build 265 --- a/source4/libnet/wscript_build
254 +++ b/source4/libnet/wscript_build 266 +++ b/source4/libnet/wscript_build
255 @@ -3,7 +3,7 @@ 267 @@ -3,7 +3,7 @@
256 bld.SAMBA_LIBRARY('samba-net', 268 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', 269 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', 270 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', 271 - 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', 272 + 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 273 private_library=True
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 conf.SAMBA_CHECK_PERL(mandatory=True) 337 conf.SAMBA_CHECK_PERL(mandatory=True)
326 conf.find_program('xsltproc', var='XSLTPROC') 338 conf.find_program('xsltproc', var='XSLTPROC')
327 339
328 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) 340 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
329 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) 341 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
330 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) 342 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0))
331 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) 343 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
332 344
333 if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: 345 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 346 # Mac OSX needs to have this and it's also needed that the python is co mpiled with this
OLDNEW
« 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