File exclude_external_libs.patch of Package fah-client-bastet-beta

Overview Repositories Revisions Requests Users Attributes Meta

File exclude_external_libs.patch of Package fah-client-bastet-beta

diff --git a/SConstruct b/SConstruct
index fb590214..963e9192 100644
--- a/SConstruct
+++ b/SConstruct
@@ -67,7 +67,7 @@ resources_excludes = []
 for lib in 'ZLib bzip2 lz4 sqlite3 expat boost libevent re2 libyaml'.split():
     if lib in disable_local: resources_excludes.append('licenses/%s\\.txt' % lib)
     else:
-        if not env.CBConfigEnabled(lib) or lib in force_local:
+        if ((not env.CBConfigEnabled(lib)) and (not lib in disable_local)) or lib in force_local:
             Default(SConscript('src/%s/SConscript' % lib,
                             variant_dir = 'build/' + lib))
 env.Append(RESOURCES_EXCLUDES = resources_excludes)
@@ -85,7 +85,8 @@ subdirs = [
 if env.CBConfigEnabled('openssl'): subdirs += ['openssl', 'acmev2']
 if env.CBConfigEnabled('v8'): subdirs.append('js/v8')
 if env.CBConfigEnabled('mariadb'): subdirs.append('db/maria')
-if not 'libevent' in disable_local: subdirs.append('event')
+#if not 'libevent' in disable_local: subdirs.append('event')
+subdirs.append('event')
 
 if env['PLATFORM'] == 'win32': subdirs.append('os/win')
 elif env['PLATFORM'] == 'darwin': subdirs.append('os/osx')

Places

File exclude_external_libs.patch of Package fah-client-bastet-beta

Places