2014-04-23 02:07:58 +02:00
|
|
|
From 1a7f4f5e3fbbe83e147fffdfe00d7f37181a8ec1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
|
Date: Wed, 9 Apr 2014 10:39:06 -0300
|
|
|
|
|
Subject: [PATCH 4/5] build: tweak SIZEOF utmp->ut_line
|
|
|
|
|
|
|
|
|
|
Set the critical parameter of CHECK_SIZEOF utmp->ut_line to False since
|
|
|
|
|
it's used to find out if utmp support should be enabled.
|
|
|
|
|
This is necessary with the introduction of the cross-compile aware
|
|
|
|
|
CHECK_SIZEOF.
|
|
|
|
|
|
2014-05-09 14:31:37 +02:00
|
|
|
Status: Upstream.
|
|
|
|
|
|
2014-04-23 02:07:58 +02:00
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
|
---
|
|
|
|
|
source3/wscript | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/source3/wscript b/source3/wscript
|
|
|
|
|
index e81a47b..aade503 100644
|
|
|
|
|
--- a/source3/wscript
|
|
|
|
|
+++ b/source3/wscript
|
|
|
|
|
@@ -812,7 +812,7 @@ msg.msg_acctrightslen = sizeof(fd);
|
|
|
|
|
'PUTUTLINE_RETURNS_UTMP', headers='utmp.h',
|
|
|
|
|
msg="Checking whether pututline returns pointer")
|
|
|
|
|
conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h',
|
|
|
|
|
- define='SIZEOF_UTMP_UT_LINE')
|
|
|
|
|
+ define='SIZEOF_UTMP_UT_LINE', critical=False)
|
|
|
|
|
if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):
|
|
|
|
|
conf.env.with_utmp = False
|
|
|
|
|
elif int(conf.env.SIZEOF_UTMP_UT_LINE) < 15:
|
|
|
|
|
--
|
|
|
|
|
1.8.3.2
|
|
|
|
|
|
