Browse Source

[build] mark dependencies on crypto lib for MD5()

(lighttpd base executable depends on crypto lib for rand functionality,
 so the crypto library was already being loaded -- no missing symbols)
master
Glenn Strauss 3 months ago
parent
commit
a1f6d1322a
4 changed files with 16 additions and 16 deletions
  1. +4
    -3
      src/CMakeLists.txt
  2. +4
    -4
      src/Makefile.am
  3. +4
    -4
      src/SConscript
  4. +4
    -5
      src/meson.build

+ 4
- 3
src/CMakeLists.txt View File

@ -954,7 +954,7 @@ if(WITH_LUA)
add_target_properties(mod_magnet COMPILE_FLAGS ${LUA_CFLAGS})
add_and_install_library(mod_cml "mod_cml.c;mod_cml_lua.c;mod_cml_funcs.c")
target_link_libraries(mod_cml ${LUA_LDFLAGS})
target_link_libraries(mod_cml ${LUA_LDFLAGS} ${CRYPTO_LIBRARY})
add_target_properties(mod_cml COMPILE_FLAGS ${LUA_CFLAGS})
if(WITH_MEMCACHED)
target_link_libraries(mod_cml memcached)
@ -979,7 +979,7 @@ if(HAVE_MYSQL_H AND HAVE_MYSQL)
include_directories(/usr/include/mysql)
add_and_install_library(mod_authn_mysql "mod_authn_mysql.c")
set(L_MOD_AUTHN_MYSQL)
set(L_MOD_AUTHN_MYSQL ${CRYPTO_LIBRARY})
if(HAVE_LIBCRYPT)
set(L_MOD_AUTHN_MYSQL ${L_MOD_AUTHN_MYSQL} crypt)
endif()
@ -996,7 +996,7 @@ if(HAVE_DBI_H AND HAVE_DBI)
target_link_libraries(mod_vhostdb_dbi dbi)
add_and_install_library(mod_authn_dbi "mod_authn_dbi.c")
set(L_MOD_AUTHN_DBI)
set(L_MOD_AUTHN_DBI ${CRYPTO_LIBRARY})
if(HAVE_LIBCRYPT)
set(L_MOD_AUTHN_DBI ${L_MOD_AUTHN_DBI} crypt)
endif()
@ -1122,6 +1122,7 @@ if(NOT ${CRYPTO_LIBRARY} EQUAL "")
set(L_MOD_AUTHN_FILE ${L_MOD_AUTHN_FILE} ${CRYPTO_LIBRARY})
target_link_libraries(mod_authn_file ${L_MOD_AUTHN_FILE})
target_link_libraries(mod_secdownload ${CRYPTO_LIBRARY})
target_link_libraries(mod_usertrack ${CRYPTO_LIBRARY})
target_link_libraries(mod_wstunnel ${CRYPTO_LIBRARY})
endif()


+ 4
- 4
src/Makefile.am View File

@ -163,7 +163,7 @@ lib_LTLIBRARIES += mod_cml.la
mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
mod_cml_la_LDFLAGS = $(common_module_ldflags)
mod_cml_la_LIBADD = $(MEMCACHED_LIB) $(common_libadd) $(LUA_LIBS) -lm
mod_cml_la_LIBADD = $(MEMCACHED_LIB) $(common_libadd) $(LUA_LIBS) $(CRYPTO_LIB) -lm
endif
if BUILD_MOD_TRIGGER_B4_DL
@ -265,7 +265,7 @@ mod_rrdtool_la_LIBADD = $(common_libadd)
lib_LTLIBRARIES += mod_usertrack.la
mod_usertrack_la_SOURCES = mod_usertrack.c
mod_usertrack_la_LDFLAGS = $(common_module_ldflags)
mod_usertrack_la_LIBADD = $(common_libadd)
mod_usertrack_la_LIBADD = $(common_libadd) $(CRYPTO_LIB)
lib_LTLIBRARIES += mod_proxy.la
mod_proxy_la_SOURCES = mod_proxy.c
@ -341,7 +341,7 @@ if BUILD_WITH_DBI
lib_LTLIBRARIES += mod_authn_dbi.la
mod_authn_dbi_la_SOURCES = mod_authn_dbi.c
mod_authn_dbi_la_LDFLAGS = $(common_module_ldflags)
mod_authn_dbi_la_LIBADD = $(CRYPT_LIB) $(DBI_LIBS) $(common_libadd)
mod_authn_dbi_la_LIBADD = $(CRYPT_LIB) $(DBI_LIBS) $(CRYPTO_LIB) $(common_libadd)
mod_authn_dbi_la_CPPFLAGS = $(DBI_CFLAGS)
endif
@ -370,7 +370,7 @@ if BUILD_WITH_MYSQL
lib_LTLIBRARIES += mod_authn_mysql.la
mod_authn_mysql_la_SOURCES = mod_authn_mysql.c
mod_authn_mysql_la_LDFLAGS = $(common_module_ldflags)
mod_authn_mysql_la_LIBADD = $(CRYPT_LIB) $(MYSQL_LIBS) $(common_libadd)
mod_authn_mysql_la_LIBADD = $(CRYPT_LIB) $(MYSQL_LIBS) $(CRYPTO_LIB) $(common_libadd)
mod_authn_mysql_la_CPPFLAGS = $(MYSQL_CFLAGS)
endif


+ 4
- 4
src/SConscript View File

@ -127,7 +127,7 @@ modules = {
'mod_status' : { 'src' : [ 'mod_status.c' ] },
'mod_uploadprogress' : { 'src' : [ 'mod_uploadprogress.c' ] },
'mod_userdir' : { 'src' : [ 'mod_userdir.c' ] },
'mod_usertrack' : { 'src' : [ 'mod_usertrack.c' ] },
'mod_usertrack' : { 'src' : [ 'mod_usertrack.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
'mod_vhostdb' : { 'src' : [ 'mod_vhostdb.c' ] },
'mod_webdav' : { 'src' : [ 'mod_webdav.c' ], 'lib' : [ env['LIBXML2'], env['LIBSQLITE3'], env['LIBUUID'] ] },
'mod_wstunnel' : { 'src' : [ 'mod_wstunnel.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
@ -150,7 +150,7 @@ if env['with_lua']:
modules['mod_magnet'] = { 'src' : [ 'mod_magnet.c', 'mod_magnet_cache.c' ], 'lib' : [ env['LIBLUA'] ] }
modules['mod_cml'] = {
'src' : [ 'mod_cml_lua.c', 'mod_cml.c', 'mod_cml_funcs.c' ],
'lib' : [ env['LIBMEMCACHED'], env['LIBLUA'] ]
'lib' : [ env['LIBMEMCACHED'], env['LIBLUA'], env['LIBCRYPTO'] ]
}
if env['with_pam']:
@ -160,7 +160,7 @@ if env['with_pcre'] and (env['with_memcached'] or env['with_gdbm']):
modules['mod_trigger_b4_dl'] = { 'src' : [ 'mod_trigger_b4_dl.c' ], 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'], env['LIBGDBM'] ] }
if env['with_mysql']:
modules['mod_authn_mysql'] = { 'src' : [ 'mod_authn_mysql.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBMYSQL'] ] }
modules['mod_authn_mysql'] = { 'src' : [ 'mod_authn_mysql.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBMYSQL'], env['LIBCRYPTO'] ] }
modules['mod_mysql_vhost'] = { 'src' : [ 'mod_mysql_vhost.c' ], 'lib' : [ env['LIBMYSQL'] ] }
modules['mod_vhostdb_mysql'] = { 'src' : [ 'mod_vhostdb_mysql.c' ], 'lib' : [ env['LIBMYSQL'] ] }
@ -168,7 +168,7 @@ if env['with_pgsql']:
modules['mod_vhostdb_pgsql'] = { 'src' : [ 'mod_vhostdb_pgsql.c' ], 'lib' : [ env['LIBPGSQL'] ] }
if env['with_dbi']:
modules['mod_authn_dbi'] = { 'src' : [ 'mod_authn_dbi.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBDBI'] ] }
modules['mod_authn_dbi'] = { 'src' : [ 'mod_authn_dbi.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBDBI'], env['LIBCRYPTO'] ] }
modules['mod_vhostdb_dbi'] = { 'src' : [ 'mod_vhostdb_dbi.c' ], 'lib' : [ env['LIBDBI'] ] }
if env['with_sasl']:


+ 4
- 5
src/meson.build View File

@ -776,7 +776,6 @@ executable('lighttpd-angel',
executable('lighttpd', configparser,
sources: common_src + main_src,
# libssl needed?
dependencies: [ common_flags, lighttpd_flags
, libattr
, libcrypto
@ -947,7 +946,7 @@ modules = [
[ 'mod_status', [ 'mod_status.c' ] ],
[ 'mod_uploadprogress', [ 'mod_uploadprogress.c' ] ],
[ 'mod_userdir', [ 'mod_userdir.c' ] ],
[ 'mod_usertrack', [ 'mod_usertrack.c' ] ],
[ 'mod_usertrack', [ 'mod_usertrack.c' ], libcrypto ],
[ 'mod_vhostdb', [ 'mod_vhostdb.c' ] ],
[ 'mod_webdav', [ 'mod_webdav.c' ], libsqlite3 + libuuid + libxml2 + libelftc ],
[ 'mod_wstunnel', [ 'mod_wstunnel.c' ], libcrypto ],
@ -967,7 +966,7 @@ endif
if get_option('with_lua')
modules += [
[ 'mod_cml', [ 'mod_cml.c', 'mod_cml_lua.c', 'mod_cml_funcs.c' ], liblua + libmemcached ],
[ 'mod_cml', [ 'mod_cml.c', 'mod_cml_lua.c', 'mod_cml_funcs.c' ], liblua + libmemcached + libcrypto ],
[ 'mod_magnet', [ 'mod_magnet.c', 'mod_magnet_cache.c' ], liblua ],
]
endif
@ -986,7 +985,7 @@ endif
if get_option('with_mysql')
modules += [
[ 'mod_authn_mysql', [ 'mod_authn_mysql.c' ], libcrypt + libmysqlclient ],
[ 'mod_authn_mysql', [ 'mod_authn_mysql.c' ], libcrypt + libmysqlclient + libcrypto ],
[ 'mod_mysql_vhost', [ 'mod_mysql_vhost.c' ], libmysqlclient ],
[ 'mod_vhostdb_mysql', [ 'mod_vhostdb_mysql.c' ], libmysqlclient ],
]
@ -1000,7 +999,7 @@ endif
if get_option('with_dbi')
modules += [
[ 'mod_authn_dbi', [ 'mod_authn_dbi.c' ], libcrypt + libdbi ],
[ 'mod_authn_dbi', [ 'mod_authn_dbi.c' ], libcrypt + libdbi + libcrypto ],
[ 'mod_vhostdb_dbi', [ 'mod_vhostdb_dbi.c' ], libdbi ],
]
endif


Loading…
Cancel
Save