--- embedaddon/lighttpd/src/SConscript 2013/10/14 10:32:48 1.1.1.1 +++ embedaddon/lighttpd/src/SConscript 2016/11/02 10:35:00 1.1.1.2 @@ -1,41 +1,78 @@ import os import re import types +import itertools +from collections import OrderedDict +# search any file, not just executables +def WhereIsFile(file, paths): + for d in paths: + f = os.path.join(d, file) + if os.path.isfile(f): + try: + st = os.stat(f) + except OSError: + # os.stat() raises OSError, not IOError if the file + # doesn't exist, so in this case we let IOError get + # raised so as to not mask possibly serious disk or + # network issues. + continue + return os.path.normpath(f) + return None + +def FlattenLibs(libs): + if isinstance(libs, basestring): + return [libs] + else: + return [item for sublibs in libs for item in FlattenLibs(sublibs)] + +# removes all but the *LAST* occurance of a lib in the list +def RemoveDuplicateLibs(libs): + libs = FlattenLibs(libs) + # remove empty strings from list + libs = list(filter(lambda x: x != '', libs)) + return list(reversed(OrderedDict.fromkeys(reversed(libs)))) + Import('env') -common_src = Split("buffer.c log.c \ - keyvalue.c chunk.c \ - http_chunk.c stream.c fdevent.c \ - stat_cache.c plugin.c joblist.c etag.c array.c \ - data_string.c data_count.c data_array.c \ - data_integer.c md5.c data_fastcgi.c \ - fdevent_select.c fdevent_libev.c \ - fdevent_poll.c fdevent_linux_sysepoll.c \ - fdevent_solaris_devpoll.c fdevent_solaris_port.c \ - fdevent_freebsd_kqueue.c \ - data_config.c bitset.c \ - inet_ntop_cache.c crc32.c \ - connections-glue.c \ - configfile-glue.c \ - http-header-glue.c \ - splaytree.c network_writev.c \ - network_write.c network_linux_sendfile.c \ - network_freebsd_sendfile.c \ - network_solaris_sendfilev.c network_openssl.c \ - status_counter.c \ +def GatherLibs(env, *libs): + return RemoveDuplicateLibs(env['LIBS'] + list(libs) + [env['APPEND_LIBS']]) + +common_src = Split("base64.c buffer.c log.c \ + keyvalue.c chunk.c \ + http_chunk.c stream.c fdevent.c \ + stat_cache.c plugin.c joblist.c etag.c array.c \ + data_string.c data_count.c data_array.c \ + data_integer.c md5.c data_fastcgi.c \ + vector.c \ + fdevent_select.c fdevent_libev.c \ + fdevent_poll.c fdevent_linux_sysepoll.c \ + fdevent_solaris_devpoll.c fdevent_solaris_port.c \ + fdevent_freebsd_kqueue.c \ + data_config.c \ + inet_ntop_cache.c crc32.c \ + connections-glue.c \ + configfile-glue.c \ + http-header-glue.c \ + splaytree.c network_writev.c \ + network_write_mmap.c network_write_no_mmap.c \ + network_write.c network_linux_sendfile.c \ + network_freebsd_sendfile.c \ + network_solaris_sendfilev.c network_openssl.c \ + status_counter.c safe_memclear.c network_darwin_sendfile.c \ ") src = Split("server.c response.c connections.c network.c \ - configfile.c configparser.c request.c proc_open.c") + configfile.c configparser.c request.c proc_open.c") -lemon = env.Program('lemon', 'lemon.c') +lemon = env.Program('lemon', 'lemon.c', LIBS = GatherLibs(env)) -configparser = env.Command(['configparser.c', 'configparser.h'], 'configparser.y', '(cd build; ../' + lemon[0].path + ' -q ../$SOURCE ../src/lempar.c; cd ..)') -env.Depends(configparser, lemon) +def Lemon(env, input): + parser = env.Command([input.replace('.y', '.c'),input.replace('.y', '.h')], input, '(cd sconsbuild/build; ../../' + lemon[0].path + ' -q ../../$SOURCE ../../src/lempar.c)') + env.Depends(parser, lemon) -mod_ssi_exprparser = env.Command(['mod_ssi_exprparser.c', 'mod_ssi_exprparser.h'], 'mod_ssi_exprparser.y', '(cd build; ../' + lemon[0].path + ' -q ../$SOURCE ../src/lempar.c; cd ..)') -env.Depends(mod_ssi_exprparser, lemon) +configparser = Lemon(env, 'configparser.y') +mod_ssi_exprparser = Lemon(env, 'mod_ssi_exprparser.y') ## the modules and how they are built modules = { @@ -53,7 +90,7 @@ modules = { 'mod_usertrack' : { 'src' : [ 'mod_usertrack.c' ] }, 'mod_proxy' : { 'src' : [ 'mod_proxy.c' ] }, 'mod_userdir' : { 'src' : [ 'mod_userdir.c' ] }, - 'mod_secdownload' : { 'src' : [ 'mod_secure_download.c' ] }, + 'mod_secdownload' : { 'src' : [ 'mod_secdownload.c' ] }, 'mod_accesslog' : { 'src' : [ 'mod_accesslog.c' ] }, 'mod_simple_vhost' : { 'src' : [ 'mod_simple_vhost.c' ] }, 'mod_evhost' : { 'src' : [ 'mod_evhost.c' ] }, @@ -67,19 +104,24 @@ modules = { 'lib' : [ env['LIBCRYPT'], env['LIBLDAP'], env['LIBLBER'] ] }, 'mod_webdav' : { 'src' : [ 'mod_webdav.c' ], 'lib' : [ env['LIBXML2'], env['LIBSQLITE3'], env['LIBUUID'] ] }, 'mod_mysql_vhost' : { 'src' : [ 'mod_mysql_vhost.c' ], 'lib' : [ env['LIBMYSQL'] ] }, - 'mod_trigger_b4_dl' : { 'src' : [ 'mod_trigger_b4_dl.c' ], 'lib' : [ env['LIBPCRE'] ] }, - 'mod_cml' : { - 'src' : [ 'mod_cml_lua.c', 'mod_cml.c', 'mod_cml_funcs.c' ], - 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHE'], env['LIBLUA'], env['LIBLUALIB'] ] }, # 'mod_uploadprogress' : { 'src' : [ 'mod_uploadprogress.c' ] }, 'mod_evasive' : { 'src' : [ 'mod_evasive.c' ] }, - 'mod_ssi' : { 'src' : [ 'mod_ssi_exprparser.c', 'mod_ssi_expr.c', 'mod_ssi.c' ], 'lib' : [ env['LIBPCRE'] ] }, + 'mod_ssi' : { 'src' : [ 'mod_ssi_exprparser.c', 'mod_ssi_expr.c', 'mod_ssi.c' ] }, 'mod_flv_streaming' : { 'src' : [ 'mod_flv_streaming.c' ] }, - 'mod_magnet' : { 'src' : [ 'mod_magnet.c', 'mod_magnet_cache.c' ], 'lib' : [ env['LIBLUA'] ] }, + 'mod_cml': { + 'src' : [ 'mod_cml_lua.c', 'mod_cml.c', 'mod_cml_funcs.c' ], + 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'], env['LIBLUA'] ] + }, } -staticenv = env.Copy(CPPFLAGS=[ env['CPPFLAGS'], '-DLIGHTTPD_STATIC', '-DOPENSSL_NO_KRB5']) +if env['with_memcached']: + modules['mod_trigger_b4_dl'] = { 'src' : [ 'mod_trigger_b4_dl.c' ], 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'] ] } +if env['with_lua']: + modules['mod_magnet'] = { 'src' : [ 'mod_magnet.c', 'mod_magnet_cache.c' ], 'lib' : [ env['LIBLUA'] ] } + +staticenv = env.Clone(CPPFLAGS=[ env['CPPFLAGS'], '-DLIGHTTPD_STATIC' ]) + ## all the core-sources + the modules staticsrc = src + common_src @@ -91,16 +133,37 @@ for module in modules.keys(): if modules[module].has_key('lib'): staticlib += modules[module]['lib'] -open('plugin-static.h', 'w+').write(staticinit) +def WriteStaticPluginHeader(target, source, env): + do_write = True + data = env['STATICINIT'] + # only touch the file if content actually changes + try: + with open(target[0].abspath, 'r') as f: + do_write = (data != f.read()) + except IOError: + pass + if do_write: + with open(target[0].abspath, 'w+') as f: + f.write(env['STATICINIT']) +env['STATICINIT'] = staticinit +staticheader = env.AlwaysBuild(env.Command('plugin-static.h', [], WriteStaticPluginHeader)) + ## turn all src-files into objects staticobj = [] +static_plugin_obj = None for cfile in staticsrc: - staticobj += [ staticenv.Object('static-' + cfile.replace('.c', ''), cfile) ] + if cfile == 'plugin.c': + static_plugin_obj = [ staticenv.Object('static-' + cfile.replace('.c', ''), cfile) ] + staticobj += static_plugin_obj + else: + staticobj += [ staticenv.Object('static-' + cfile.replace('.c', ''), cfile) ] +env.Depends(static_plugin_obj, 'plugin-static.h') -staticbin = staticenv.Program('lighttpd-semi-static', +## includes all modules, but links dynamically against other libs +staticbin = staticenv.Program('../static/build/lighttpd', staticobj, - LIBS = staticlib + LIBS = GatherLibs(env, staticlib) ) ## you might have to adjust the list of libs and the order for your setup @@ -111,14 +174,20 @@ fullstaticlib = [] ## 1. find the lib ## 2. check the deps ## 3. add them to the libs -searchlibs = os.pathsep.join([ '/lib/', '/usr/lib/', '/usr/local/lib/' ]) +#searchlibs = os.pathsep.join([ '/lib/', '/usr/lib/', '/usr/local/lib/' ]) +searchlibs = [] +searchpathre = re.compile(r'\bSEARCH_DIR\("=([^"]+)"\)') +f = os.popen('ld --verbose | grep SEARCH_DIR', 'r') +for aword in searchpathre.findall(f.read()): + searchlibs += [ aword] +f.close + lddre = re.compile(r'^\s+lib([^=-]+)(?:-[\.0-9]+)?\.so\.[0-9]+ =>', re.MULTILINE) for libs in staticlib: if type(libs) is types.StringType: libs = [ libs ] for lib in libs: fullstaticlib += [ lib ] - solibpath = env.WhereIs('lib' + lib + '.so', searchlibs) - fullstaticlib += [ lib ] + solibpath = WhereIsFile('lib' + lib + '.so', paths = searchlibs) if solibpath is None: continue @@ -127,11 +196,11 @@ for libs in staticlib: fullstaticlib += [ aword ] f.close - -fullstaticbin = staticenv.Program('lighttpd-static', +## includes all modules, linked statically +fullstaticbin = staticenv.Program('../fullstatic/build/lighttpd', staticobj, - LIBS = fullstaticlib, - LINKFLAGS= ['-static'] + LIBS = GatherLibs(env, fullstaticlib), + LINKFLAGS= [staticenv['LINKFLAGS'], '-static'] ) Alias('static', staticbin) @@ -151,7 +220,7 @@ else: else: bin_linkflags += [ '-Wl,--export-dynamic' ] -instbin = env.Program(bin_targets, src, LINKFLAGS = bin_linkflags, LIBS= [ env['LIBS'], common_lib, env['LIBDL'] ]) +instbin = env.Program(bin_targets, src, LINKFLAGS = bin_linkflags, LIBS = GatherLibs(env, env['LIBS'], common_lib, env['LIBDL'])) env.Depends(instbin, configparser) if env['COMMON_LIB'] == 'bin': @@ -163,7 +232,8 @@ for module in modules.keys(): libs = [ common_lib ] if modules[module].has_key('lib'): libs += modules[module]['lib'] - instlib += env.SharedLibrary(module, modules[module]['src'], LIBS= [ libs ]) + instlib += env.SharedLibrary(module, modules[module]['src'], LIBS= GatherLibs(env, libs)) +env.Alias('modules', instlib) inst = [] @@ -189,4 +259,3 @@ env.Alias('install', inst) pkgdir = '.' tarname = env['package'] + '-' + env['version'] -