|
Lines 1-6
Link Here
|
| 1 |
--- ./source3/wscript.orig 2013-02-05 12:25:26.000000000 +0000 |
1 |
--- source3/wscript.orig 2013-05-21 08:48:46.000000000 +0200 |
| 2 |
+++ ./source3/wscript 2013-02-15 17:54:40.099886239 +0000 |
2 |
+++ source3/wscript 2013-11-11 20:46:22.508193334 +0100 |
| 3 |
@@ -475,7 +475,7 @@ |
3 |
@@ -312,7 +312,9 @@ |
|
|
4 |
|
| 5 |
# Check if the compiler will optimize out functions |
| 6 |
conf.CHECK_CODE(''' |
| 7 |
-if (0) { |
| 8 |
+char s = "string"; |
| 9 |
+int len = 6; |
| 10 |
+if (sizeof(s) != len && sizeof(s) != sizeof(char *)) { |
| 11 |
this_function_does_not_exist(); |
| 12 |
} else { |
| 13 |
return 1; |
| 14 |
@@ -502,7 +504,7 @@ |
| 4 |
conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt') |
15 |
conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt') |
| 5 |
conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt') |
16 |
conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt') |
| 6 |
conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt') |
17 |
conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt') |
|
Lines 9-15
Link Here
|
| 9 |
if not conf.CONFIG_SET('HAVE_AIO'): |
20 |
if not conf.CONFIG_SET('HAVE_AIO'): |
| 10 |
conf.DEFINE('HAVE_NO_AIO', '1') |
21 |
conf.DEFINE('HAVE_NO_AIO', '1') |
| 11 |
else: |
22 |
else: |
| 12 |
@@ -1644,26 +1644,8 @@ |
23 |
@@ -1671,26 +1673,8 @@ |
| 13 |
|
24 |
|
| 14 |
if PTHREAD_LDFLAGS == 'error': |
25 |
if PTHREAD_LDFLAGS == 'error': |
| 15 |
if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'): |
26 |
if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'): |
|
Lines 37-43
Link Here
|
| 37 |
|
48 |
|
| 38 |
if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error': |
49 |
if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error': |
| 39 |
conf.ADD_CFLAGS(PTHREAD_CFLAGS) |
50 |
conf.ADD_CFLAGS(PTHREAD_CFLAGS) |
| 40 |
@@ -1693,8 +1675,8 @@ |
51 |
@@ -1720,8 +1704,8 @@ |
| 41 |
auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb |
52 |
auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb |
| 42 |
vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb |
53 |
vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb |
| 43 |
vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly |
54 |
vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly |
|
Lines 48-54
Link Here
|
| 48 |
vfs_crossrename vfs_linux_xfs_sgid |
59 |
vfs_crossrename vfs_linux_xfs_sgid |
| 49 |
vfs_time_audit idmap_autorid idmap_tdb2 |
60 |
vfs_time_audit idmap_autorid idmap_tdb2 |
| 50 |
idmap_rid idmap_hash''')) |
61 |
idmap_rid idmap_hash''')) |
| 51 |
@@ -1707,7 +1689,7 @@ |
62 |
@@ -1734,7 +1718,7 @@ |
| 52 |
|
63 |
|
| 53 |
if Options.options.enable_selftest or Options.options.developer: |
64 |
if Options.options.enable_selftest or Options.options.developer: |
| 54 |
default_shared_modules.extend(TO_LIST('vfs_fake_acls')) |
65 |
default_shared_modules.extend(TO_LIST('vfs_fake_acls')) |
|
Lines 57-68
Link Here
|
| 57 |
|
68 |
|
| 58 |
if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): |
69 |
if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): |
| 59 |
default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4')) |
70 |
default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4')) |
| 60 |
@@ -1740,7 +1722,7 @@ |
71 |
@@ -1767,7 +1751,7 @@ |
| 61 |
default_static_modules.extend(TO_LIST('charset_macosxfs')) |
72 |
default_static_modules.extend(TO_LIST('charset_macosxfs')) |
| 62 |
|
73 |
|
| 63 |
if conf.CONFIG_SET('HAVE_GPFS'): |
74 |
if conf.CONFIG_SET('HAVE_GPFS'): |
| 64 |
- default_shared_modules.extend(TO_LIST('vfs_gpfs')) |
75 |
- default_shared_modules.extend(TO_LIST('vfs_gpfs')) |
| 65 |
+ default_shared_modules.extend(TO_LIST('vfs_gpfs')) |
76 |
+ default_shared_modules.extend(TO_LIST('vfs_gpfs')) |
| 66 |
|
77 |
|
| 67 |
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',') |
78 |
if conf.CONFIG_SET('SAMBA_FAM_LIBS'): |
| 68 |
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',') |
79 |
default_shared_modules.extend(TO_LIST('vfs_notify_fam')) |