--- embedaddon/lighttpd/SConstruct 2014/06/15 20:20:05 1.1.1.2 +++ embedaddon/lighttpd/SConstruct 2016/11/02 10:35:00 1.1.1.3 @@ -5,7 +5,7 @@ import string from stat import * package = 'lighttpd' -version = '1.4.35' +version = '1.4.41' def checkCHeaders(autoconf, hdrs): p = re.compile('[^A-Z0-9]') @@ -13,8 +13,8 @@ def checkCHeaders(autoconf, hdrs): if not hdr: continue _hdr = Split(hdr) - if autoconf.CheckCHeader(_hdr): - autoconf.env.Append(CPPFLAGS = [ '-DHAVE_' + p.sub('_', _hdr[-1].upper()) ]) + if autoconf.CheckCHeader(_hdr): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_' + p.sub('_', _hdr[-1].upper()) ]) def checkFuncs(autoconf, funcs): p = re.compile('[^A-Z0-9]') @@ -28,6 +28,52 @@ def checkTypes(autoconf, types): if autoconf.CheckType(type, '#include '): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_' + p.sub('_', type.upper()) ]) +def checkGmtOffInStructTm(context): + source = """ +#include +int main() { + struct tm a; + a.tm_gmtoff = 0; + return 0; +} +""" + context.Message('Checking for tm_gmtoff in struct tm...') + result = context.TryLink(source, '.c') + context.Result(result) + + return result + +def checkIPv6(context): + source = """ +#include +#include +#include + +int main() { + struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; + return 0; +} +""" + context.Message('Checking for IPv6 support...') + result = context.TryLink(source, '.c') + context.Result(result) + + return result + +def checkWeakSymbols(context): + source = """ +__attribute__((weak)) void __dummy(void *x) { } +int main() { + void *x; + __dummy(x); +} +""" + context.Message('Checking for weak symbol support...') + result = context.TryLink(source, '.c') + context.Result(result) + + return result + def checkProgram(env, withname, progname): withname = 'with_' + withname binpath = None @@ -54,53 +100,38 @@ def checkProgram(env, withname, progname): return binpath -def checkStructMember(context): - struct_member = """ -#include -int main() { - struct tm a; - a.tm_gmtoff = 0; - return 0; -} -""" - context.Message('Checking for tm_gmtoff in struct tm...') - result = context.TryLink(struct_member, '.c') - context.Result(result) +VariantDir('sconsbuild/build', 'src', duplicate = 0) +VariantDir('sconsbuild/tests', 'tests', duplicate = 0) - return result - - -BuildDir('build', 'src', duplicate = 0) - -opts = Options('config.py') -opts.AddOptions( +vars = Variables() #('config.py') +vars.AddVariables( ('prefix', 'prefix', '/usr/local'), ('bindir', 'binary directory', '${prefix}/bin'), ('sbindir', 'binary directory', '${prefix}/sbin'), ('libdir', 'library directory', '${prefix}/lib'), - PackageOption('with_mysql', 'enable mysql support', 'no'), - PackageOption('with_xml', 'enable xml support', 'no'), - PackageOption('with_pcre', 'enable pcre support', 'yes'), - PathOption('CC', 'path to the c-compiler', None), - BoolOption('build_dynamic', 'enable dynamic build', 'yes'), - BoolOption('build_static', 'enable static build', 'no'), - BoolOption('build_fullstatic', 'enable fullstatic build', 'no'), - BoolOption('with_sqlite3', 'enable sqlite3 support', 'no'), - BoolOption('with_memcache', 'enable memcache support', 'no'), - BoolOption('with_fam', 'enable FAM/gamin support', 'no'), - BoolOption('with_openssl', 'enable memcache support', 'no'), - BoolOption('with_gzip', 'enable gzip compression', 'no'), - BoolOption('with_bzip2', 'enable bzip2 compression', 'no'), - BoolOption('with_lua', 'enable lua support for mod_cml', 'no'), - BoolOption('with_ldap', 'enable ldap auth support', 'no')) + PackageVariable('with_mysql', 'enable mysql support', 'no'), + PackageVariable('with_xml', 'enable xml support', 'no'), + PackageVariable('with_pcre', 'enable pcre support', 'yes'), + PathVariable('CC', 'path to the c-compiler', None), + BoolVariable('build_dynamic', 'enable dynamic build', 'yes'), + BoolVariable('build_static', 'enable static build', 'no'), + BoolVariable('build_fullstatic', 'enable fullstatic build', 'no'), + BoolVariable('with_sqlite3', 'enable sqlite3 support', 'no'), + BoolVariable('with_memcached', 'enable memcached support', 'no'), + BoolVariable('with_fam', 'enable FAM/gamin support', 'no'), + BoolVariable('with_openssl', 'enable openssl support', 'no'), + BoolVariable('with_gzip', 'enable gzip compression', 'no'), + BoolVariable('with_bzip2', 'enable bzip2 compression', 'no'), + BoolVariable('with_lua', 'enable lua support for mod_cml', 'no'), + BoolVariable('with_ldap', 'enable ldap auth support', 'no')) env = Environment( - env = os.environ, - options = opts, - CPPPATH = Split('#build') + ENV = os.environ, + variables = vars, + CPPPATH = Split('#sconsbuild/build') ) -env.Help(opts.GenerateHelpText(env)) +env.Help(vars.GenerateHelpText(env)) if env.subst('${CC}') is not '': env['CC'] = env.subst('${CC}') @@ -113,68 +144,96 @@ if env['CC'] == 'gcc': # cache configure checks if 1: - autoconf = Configure(env, custom_tests = {'CheckStructMember': checkStructMember }) + autoconf = Configure(env, custom_tests = { + 'CheckGmtOffInStructTm': checkGmtOffInStructTm, + 'CheckIPv6': checkIPv6, + 'CheckWeakSymbols': checkWeakSymbols, + }) + + if 'CFLAGS' in os.environ: + autoconf.env.Append(CCFLAGS = os.environ['CFLAGS']) + print(">> Appending custom build flags : " + os.environ['CFLAGS']) + + if 'LDFLAGS' in os.environ: + autoconf.env.Append(LINKFLAGS = os.environ['LDFLAGS']) + print(">> Appending custom link flags : " + os.environ['LDFLAGS']) + + if 'LIBS' in os.environ: + autoconf.env.Append(APPEND_LIBS = os.environ['LIBS']) + print(">> Appending custom libraries : " + os.environ['LIBS']) + else: + autoconf.env.Append(APPEND_LIBS = '') + autoconf.headerfile = "foo.h" checkCHeaders(autoconf, string.split(""" arpa/inet.h + crypt.h fcntl.h + getopt.h + inttypes.h netinet/in.h - sys/types.h netinet/in.h + poll.h + pwd.h + stdint.h stdlib.h string.h - sys/socket.h - sys/types.h sys/socket.h - sys/time.h - unistd.h - sys/sendfile.h - sys/uio.h - sys/types.h sys/uio.h - getopt.h - sys/epoll.h - sys/select.h - sys/types.h sys/select.h - poll.h - sys/poll.h sys/devpoll.h + sys/epoll.h + sys/event.h sys/filio.h sys/mman.h - sys/types.h sys/mman.h - sys/event.h - sys/types.h sys/event.h + sys/poll.h sys/port.h - winsock2.h - pwd.h - sys/syslimits.h + sys/prctl.h sys/resource.h + sys/select.h + sys/sendfile.h + sys/socket.h + sys/time.h sys/time.h sys/types.h sys/resource.h - sys/un.h + sys/types.h netinet/in.h + sys/types.h sys/event.h + sys/types.h sys/mman.h + sys/types.h sys/select.h + sys/types.h sys/socket.h + sys/types.h sys/uio.h sys/types.h sys/un.h + sys/uio.h + sys/un.h + sys/wait.h syslog.h - stdint.h - inttypes.h - sys/prctl.h - sys/wait.h""", "\n")) + unistd.h + winsock2.h""", "\n")) checkFuncs(autoconf, Split('fork stat lstat strftime dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \ - strdup strerror strstr strtol sendfile getopt socket \ + strdup strerror strstr strtol sendfile getopt socket \ gethostbyname poll epoll_ctl getrlimit chroot \ getuid select signal pathconf madvise prctl\ - writev sigaction sendfile64 send_file kqueue port_create localtime_r posix_fadvise issetugid inet_pton')) + writev sigaction sendfile64 send_file kqueue port_create localtime_r posix_fadvise issetugid inet_pton \ + memset_s explicit_bzero clock_gettime')) checkTypes(autoconf, Split('pid_t size_t off_t')) autoconf.env.Append( LIBSQLITE3 = '', LIBXML2 = '', LIBMYSQL = '', LIBZ = '', - LIBBZ2 = '', LIBCRYPT = '', LIBMEMCACHE = '', LIBFCGI = '', LIBPCRE = '', - LIBLDAP = '', LIBLBER = '', LIBLUA = '', LIBLUALIB = '', LIBDL = '') + LIBBZ2 = '', LIBCRYPT = '', LIBMEMCACHED = '', LIBFCGI = '', LIBPCRE = '', + LIBLDAP = '', LIBLBER = '', LIBLUA = '', LIBDL = '', LIBUUID = '') if env['with_fam']: if autoconf.CheckLibWithHeader('fam', 'fam.h', 'C'): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_FAM_H', '-DHAVE_LIBFAM' ], LIBS = 'fam') checkFuncs(autoconf, ['FAMNoExists']); + if autoconf.CheckLib('crypt'): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_LIBCRYPT' ], LIBCRYPT = 'crypt') + oldlib = env['LIBS'] + env['LIBS'] += ['crypt'] + checkFuncs(autoconf, ['crypt', 'crypt_r']); + env['LIBS'] = oldlib + else: + checkFuncs(autoconf, ['crypt', 'crypt_r']); - if autoconf.CheckLibWithHeader('crypt', 'crypt.h', 'C'): - autoconf.env.Append(CPPFLAGS = [ '-DHAVE_CRYPT_H', '-DHAVE_LIBCRYPT' ], LIBCRYPT = 'crypt') + if autoconf.CheckLibWithHeader('rt', 'time.h', 'c', 'clock_gettime(CLOCK_MONOTONIC, (struct timespec*)0);'): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_CLOCK_GETTIME' ], LIBS = [ 'rt' ]) if autoconf.CheckLibWithHeader('uuid', 'uuid/uuid.h', 'C'): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_UUID_UUID_H', '-DHAVE_LIBUUID' ], LIBUUID = 'uuid') @@ -197,9 +256,9 @@ if 1: if autoconf.CheckLibWithHeader('bz2', 'bzlib.h', 'C'): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_BZLIB_H', '-DHAVE_LIBBZ2' ], LIBBZ2 = 'bz2') - if env['with_memcache']: - if autoconf.CheckLibWithHeader('memcache', 'memcache.h', 'C'): - autoconf.env.Append(CPPFLAGS = [ '-DHAVE_MEMCACHE_H', '-DHAVE_LIBMEMCACHE' ], LIBMEMCACHE = 'memcache') + if env['with_memcached']: + if autoconf.CheckLibWithHeader('memcached', 'libmemcached/memcached.h', 'C'): + autoconf.env.Append(CPPFLAGS = [ '-DUSE_MEMCACHED' ], LIBMEMCACHED = 'memcached') if env['with_sqlite3']: if autoconf.CheckLibWithHeader('sqlite3', 'sqlite3.h', 'C'): @@ -221,19 +280,39 @@ if 1: if autoconf.CheckType('struct sockaddr_storage', '#include \n'): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_STRUCT_SOCKADDR_STORAGE' ]) - if autoconf.CheckStructMember(): + if autoconf.CheckGmtOffInStructTm(): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_STRUCT_TM_GMTOFF' ]) + if autoconf.CheckIPv6(): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_IPV6' ]) + + if autoconf.CheckWeakSymbols(): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_WEAK_SYMBOLS' ]) + env = autoconf.Finish() - if env['with_lua']: - oldlibs = env['LIBS'] - env.ParseConfig("pkg-config 'lua >= 5.0' --cflags --libs") - lualibs = env['LIBS'][len(oldlibs):] - env.Append(LIBLUA = lualibs) +def TryLua(env, name): + result = False + oldlibs = env['LIBS'] + try: + print("Searching for lua: " + name + " >= 5.0") + env.ParseConfig("pkg-config '" + name + " >= 5.0' --cflags --libs") + env.Append(LIBLUA = env['LIBS'][len(oldlibs):]) env.Append(CPPFLAGS = [ '-DHAVE_LUA_H' ]) - env['LIBS'] = oldlibs + result = True + except: + pass + env['LIBS'] = oldlibs + return result +if env['with_lua']: + found_lua = False + for lua_name in ['lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua']: + if TryLua(env, lua_name): + found_lua = True + break + if not found_lua: + raise RuntimeError("Couldn't find any lua implementation") if env['with_pcre']: pcre_config = checkProgram(env, 'pcre', 'pcre-config') @@ -266,12 +345,12 @@ else: versions = string.split(version, '.') version_id = int(versions[0]) << 16 | int(versions[1]) << 8 | int(versions[2]) env.Append(CPPFLAGS = [ - '-DLIGHTTPD_VERSION_ID=' + str(version_id), + '-DLIGHTTPD_VERSION_ID=' + hex(version_id), '-DPACKAGE_NAME=\\"' + package + '\\"', '-DPACKAGE_VERSION=\\"' + version + '\\"', '-DLIBRARY_DIR="\\"${libdir}\\""', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE', '-D_LARGE_FILES' ] ) -SConscript( 'src/SConscript', 'env', build_dir = 'build', duplicate = 0) -SConscript( 'tests/SConscript', 'env' ) +SConscript('src/SConscript', exports = 'env', variant_dir = 'sconsbuild/build', duplicate = 0) +SConscript('tests/SConscript', exports = 'env', variant_dir = 'sconsbuild/tests')