blob: 8302487a99ce5571ebe7dedf376b18285f626f6e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 960d710ee5410a5c03815a5ce6837203be00d218 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 30 Jan 2014 11:14:27 -0300
Subject: [PATCH 1/3] build: don't execute tests/summary.c
tests/summary.c will never be able to be executed when cross compiling.
Use #error and #warning directives to fail or warn accordingly when
compiling it.
Status: Upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
tests/summary.c | 14 +++++---------
wscript | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/summary.c b/tests/summary.c
index 27f7d4d..0843ee2 100644
--- a/tests/summary.c
+++ b/tests/summary.c
@@ -5,27 +5,23 @@ void exit(int);
int main()
{
#if !defined(HAVE_FCNTL_LOCK)
- printf("ERROR: No locking available. Running Samba would be unsafe\n");
- exit(1);
+#error "ERROR: No locking available. Running Samba would be unsafe"
#endif
#if !(defined(HAVE_IFACE_GETIFADDRS) || defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
- printf("WARNING: No automated network interface determination\n");
+#warning "WARNING: No automated network interface determination"
#endif
#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(USE_LINUX_THREAD_CREDENTIALS))
- printf("ERROR: no seteuid method available\n");
- exit(1);
+#error "ERROR: no seteuid method available"
#endif
#if !(defined(STAT_STATVFS) || defined(STAT_STATFS3_OSF1) || defined(STAT_STATFS2_BSIZE) || defined(STAT_STATFS4) || defined(STAT_STATFS2_FSIZE) || defined(STAT_STATFS2_FS_DATA))
- printf("ERROR: No disk free routine!\n");
- exit(1);
+#error "ERROR: No disk free routine!"
#endif
#if !((defined(HAVE_RANDOM) || defined(HAVE_RAND)) && (defined(HAVE_SRANDOM) || defined(HAVE_SRAND)))
- printf("ERROR: No random or srandom routine!\n");
- exit(1);
+#error "ERROR: No random or srandom routine!"
#endif
exit(0);
diff --git a/wscript b/wscript
index 47b7b50..26431a4 100644
--- a/wscript
+++ b/wscript
@@ -170,7 +170,6 @@ def configure(conf):
if not conf.CHECK_CODE('#include "tests/summary.c"',
define='SUMMARY_PASSES',
addmain=False,
- execute=True,
msg='Checking configure summary'):
raise Utils.WafError('configure summary failed')
--
1.8.3.2
|
