sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

build: Notice if flex is missing at configure time

Browse Source 
This may also fix the coverage build by ensuring --noline
is always specified to flex.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14586

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Mar 29 02:12:23 UTC 2021 on sn-devel-184

(cherry picked from commit 942c0d2128)

Autobuild-User(v4-14-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-14-test): Tue Apr 20 07:39:05 UTC 2021 on sn-devel-184
This commit is contained in:
Andrew Bartlett 2021-03-26 21:48:45 +13:00 committed by Karolin Seeger
parent b74a079a20
commit 1cf726dd52
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/wscript
View File

@ -1838,15 +1838,6 @@ main() {
define=None, define=None,
on_target=False) on_target=False)
Logs.info("Checking for flex")
conf.find_program('flex', var='FLEX')
if conf.env['FLEX']:
conf.env.FLEXFLAGS = ['-t']
conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0],
msg='Using flex version',
define=None,
on_target=False)
with_spotlight_tracker_backend = ( with_spotlight_tracker_backend = (
conf.CONFIG_SET('HAVE_TRACKER') conf.CONFIG_SET('HAVE_TRACKER')
and conf.CONFIG_SET('HAVE_GLIB') and conf.CONFIG_SET('HAVE_GLIB')

16
wscript
View File

@ -240,6 +240,19 @@ def configure(conf):
if not (Options.options.without_ad_dc): if not (Options.options.without_ad_dc):
conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
# Check for flex before doing the embedded heimdal checks so we can bail if we don't have it.
Logs.info("Checking for flex")
conf.find_program('flex', var='FLEX')
if conf.env['FLEX']:
conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0],
msg='Using flex version',
define=None,
on_target=False)
conf.env.FLEXFLAGS = ['-t']
# #line statements in these generated files cause issues for lcov
conf.env.FLEXFLAGS += ["--noline"]
if Options.options.with_system_mitkrb5: if Options.options.with_system_mitkrb5:
if not Options.options.with_experimental_mit_ad_dc and \ if not Options.options.with_experimental_mit_ad_dc and \
not Options.options.without_ad_dc: not Options.options.without_ad_dc:
@ -372,9 +385,6 @@ def configure(conf):
msg="Checking compiler for full RELRO support"): msg="Checking compiler for full RELRO support"):
conf.env['ENABLE_RELRO'] = True conf.env['ENABLE_RELRO'] = True
# #line statements in these generated files cause issues for lcov
conf.env.FLEXFLAGS += ["--noline"]
conf.SAMBA_CONFIG_H('include/config.h') conf.SAMBA_CONFIG_H('include/config.h')
def etags(ctx): def etags(ctx):

3
wscript_configure_embedded_heimdal
View File

@ -1 +1,4 @@
if not conf.env['FLEX']:
conf.fatal("Embedded Heimdal build requires flex but it was not found. Install flex or use --with-system-mitkrb5 or --with-system-heimdalkrb5")
conf.RECURSE('source4/heimdal_build') conf.RECURSE('source4/heimdal_build')