components/lighttpd/patches/lighttpd-src.Makefile.am.patch
branchs11u1-sru
changeset 3190 44a15b136f48
parent 3189 29f154187658
child 3191 59fa2e6aecea
equal deleted inserted replaced
3189:29f154187658 3190:44a15b136f48
     1 Developed in-house, fed back, accepted for ver 1.4.34
       
     2 http://redmine.lighttpd.net/issues/2533
       
     3 Due to differences between Linux and Solaris, we have to change
       
     4 behavior of libtool, which uses -z defs even for shared libraries,
       
     5 but this couldn't be used on Solaris.
       
     6 There is -z text that could be used instead, but that would
       
     7 require patching libtool files on build machine. So we skip
       
     8  -z defs by omitting -no-undefined
       
     9 
       
    10 --- configure.ac	2013-11-04 03:03:07.543168957 -0800
       
    11 +++ configure.ac	2013-11-04 03:02:30.584721483 -0800
       
    12 @@ -45,6 +45,13 @@
       
    13  AC_ISC_POSIX
       
    14  AC_MINIX
       
    15  
       
    16 +dnl Fix no-undefined if on solaris
       
    17 +case $host_os in
       
    18 +	*solaris* ) LIB_NO_UNDEFINED=no;;
       
    19 +	* ) LIB_NO_UNDEFINED=yes;;
       
    20 +esac
       
    21 +AM_CONDITIONAL(LIB_NO_UNDEFINED, test x$LIB_NO_UNDEFINED = xyes)
       
    22 +
       
    23  dnl AC_CANONICAL_HOST
       
    24  case $host_os in
       
    25  	*darwin*|*cygwin*|*aix*|*mingw* ) NO_RDYNAMIC=yes;;
       
    26 --- src/Makefile.am	2013-11-04 05:37:18.206746790 -0800
       
    27 +++ src/Makefile.am	2013-11-04 05:37:09.639723519 -0800
       
    28 @@ -96,173 +96,178 @@
       
    29  common_libadd =
       
    30  endif
       
    31  
       
    32 +if LIB_NO_UNDEFINED
       
    33 +LIB_NO_UNDEF="-no-undefined"
       
    34 +else
       
    35 +LIB_NO_UNDEF=""
       
    36 +endif
       
    37  lib_LTLIBRARIES += mod_flv_streaming.la
       
    38  mod_flv_streaming_la_SOURCES = mod_flv_streaming.c
       
    39 -mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    40 +mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    41  mod_flv_streaming_la_LIBADD = $(common_libadd)
       
    42  
       
    43  lib_LTLIBRARIES += mod_evasive.la
       
    44  mod_evasive_la_SOURCES = mod_evasive.c
       
    45 -mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    46 +mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    47  mod_evasive_la_LIBADD = $(common_libadd)
       
    48  
       
    49  lib_LTLIBRARIES += mod_webdav.la
       
    50  mod_webdav_la_SOURCES = mod_webdav.c
       
    51  mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS) 
       
    52 -mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    53 +mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    54  mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIBS)
       
    55  
       
    56  lib_LTLIBRARIES += mod_magnet.la
       
    57  mod_magnet_la_SOURCES = mod_magnet.c mod_magnet_cache.c
       
    58  mod_magnet_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
       
    59 -mod_magnet_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    60 +mod_magnet_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    61  mod_magnet_la_LIBADD = $(common_libadd) $(LUA_LIBS) -lm
       
    62  
       
    63  lib_LTLIBRARIES += mod_cml.la
       
    64  mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
       
    65  mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
       
    66 -mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    67 +mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    68  mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS) -lm
       
    69  
       
    70  lib_LTLIBRARIES += mod_trigger_b4_dl.la
       
    71  mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c
       
    72 -mod_trigger_b4_dl_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    73 +mod_trigger_b4_dl_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    74  mod_trigger_b4_dl_la_LIBADD = $(GDBM_LIB) $(MEMCACHE_LIB) $(PCRE_LIB) $(common_libadd)
       
    75  
       
    76  lib_LTLIBRARIES += mod_mysql_vhost.la
       
    77  mod_mysql_vhost_la_SOURCES = mod_mysql_vhost.c
       
    78 -mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    79 +mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    80  mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
       
    81  mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE)
       
    82  
       
    83  lib_LTLIBRARIES += mod_cgi.la
       
    84  mod_cgi_la_SOURCES = mod_cgi.c
       
    85 -mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    86 +mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    87  mod_cgi_la_LIBADD = $(common_libadd)
       
    88  
       
    89  lib_LTLIBRARIES += mod_scgi.la
       
    90  mod_scgi_la_SOURCES = mod_scgi.c
       
    91 -mod_scgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    92 +mod_scgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    93  mod_scgi_la_LIBADD = $(common_libadd)
       
    94  
       
    95  lib_LTLIBRARIES += mod_staticfile.la
       
    96  mod_staticfile_la_SOURCES = mod_staticfile.c
       
    97 -mod_staticfile_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
    98 +mod_staticfile_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
    99  mod_staticfile_la_LIBADD = $(common_libadd)
       
   100  
       
   101  lib_LTLIBRARIES += mod_dirlisting.la
       
   102  mod_dirlisting_la_SOURCES = mod_dirlisting.c
       
   103 -mod_dirlisting_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   104 +mod_dirlisting_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   105  mod_dirlisting_la_LIBADD = $(common_libadd) $(PCRE_LIB)
       
   106  
       
   107  lib_LTLIBRARIES += mod_indexfile.la
       
   108  mod_indexfile_la_SOURCES = mod_indexfile.c
       
   109 -mod_indexfile_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   110 +mod_indexfile_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   111  mod_indexfile_la_LIBADD = $(common_libadd)
       
   112  
       
   113  lib_LTLIBRARIES += mod_setenv.la
       
   114  mod_setenv_la_SOURCES = mod_setenv.c
       
   115 -mod_setenv_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   116 +mod_setenv_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   117  mod_setenv_la_LIBADD = $(common_libadd)
       
   118  
       
   119  lib_LTLIBRARIES += mod_alias.la
       
   120  mod_alias_la_SOURCES = mod_alias.c
       
   121 -mod_alias_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   122 +mod_alias_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   123  mod_alias_la_LIBADD = $(common_libadd)
       
   124  
       
   125  lib_LTLIBRARIES += mod_userdir.la
       
   126  mod_userdir_la_SOURCES = mod_userdir.c
       
   127 -mod_userdir_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   128 +mod_userdir_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   129  mod_userdir_la_LIBADD = $(common_libadd)
       
   130  
       
   131  lib_LTLIBRARIES += mod_rrdtool.la
       
   132  mod_rrdtool_la_SOURCES = mod_rrdtool.c
       
   133 -mod_rrdtool_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   134 +mod_rrdtool_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   135  mod_rrdtool_la_LIBADD = $(common_libadd)
       
   136  
       
   137  lib_LTLIBRARIES += mod_usertrack.la
       
   138  mod_usertrack_la_SOURCES = mod_usertrack.c
       
   139 -mod_usertrack_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   140 +mod_usertrack_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   141  mod_usertrack_la_LIBADD = $(common_libadd)
       
   142  
       
   143  lib_LTLIBRARIES += mod_proxy.la
       
   144  mod_proxy_la_SOURCES = mod_proxy.c
       
   145 -mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   146 +mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   147  mod_proxy_la_LIBADD = $(common_libadd)
       
   148  
       
   149  lib_LTLIBRARIES += mod_ssi.la
       
   150  mod_ssi_la_SOURCES = mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c
       
   151 -mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   152 +mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   153  mod_ssi_la_LIBADD = $(common_libadd) $(PCRE_LIB)
       
   154  
       
   155  lib_LTLIBRARIES += mod_secdownload.la
       
   156  mod_secdownload_la_SOURCES = mod_secure_download.c
       
   157 -mod_secdownload_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   158 +mod_secdownload_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   159  mod_secdownload_la_LIBADD = $(common_libadd)
       
   160  
       
   161  #lib_LTLIBRARIES += mod_httptls.la
       
   162  #mod_httptls_la_SOURCES = mod_httptls.c
       
   163 -#mod_httptls_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   164 +#mod_httptls_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   165  #mod_httptls_la_LIBADD = $(common_libadd)
       
   166  
       
   167  lib_LTLIBRARIES += mod_expire.la
       
   168  mod_expire_la_SOURCES = mod_expire.c
       
   169 -mod_expire_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   170 +mod_expire_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   171  mod_expire_la_LIBADD = $(common_libadd)
       
   172  
       
   173  lib_LTLIBRARIES += mod_evhost.la
       
   174  mod_evhost_la_SOURCES = mod_evhost.c
       
   175 -mod_evhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   176 +mod_evhost_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   177  mod_evhost_la_LIBADD = $(common_libadd)
       
   178  
       
   179  lib_LTLIBRARIES += mod_simple_vhost.la
       
   180  mod_simple_vhost_la_SOURCES = mod_simple_vhost.c
       
   181 -mod_simple_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   182 +mod_simple_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   183  mod_simple_vhost_la_LIBADD = $(common_libadd)
       
   184  
       
   185  lib_LTLIBRARIES += mod_fastcgi.la
       
   186  mod_fastcgi_la_SOURCES = mod_fastcgi.c
       
   187 -mod_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   188 +mod_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   189  mod_fastcgi_la_LIBADD = $(common_libadd)
       
   190  
       
   191  lib_LTLIBRARIES += mod_extforward.la
       
   192  mod_extforward_la_SOURCES = mod_extforward.c
       
   193 -mod_extforward_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   194 +mod_extforward_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   195  mod_extforward_la_LIBADD = $(common_libadd)
       
   196  
       
   197  lib_LTLIBRARIES += mod_access.la
       
   198  mod_access_la_SOURCES = mod_access.c
       
   199 -mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   200 +mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   201  mod_access_la_LIBADD = $(common_libadd)
       
   202  
       
   203  lib_LTLIBRARIES += mod_compress.la
       
   204  mod_compress_la_SOURCES = mod_compress.c
       
   205 -mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   206 +mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   207  mod_compress_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd)
       
   208  
       
   209  lib_LTLIBRARIES += mod_auth.la
       
   210  mod_auth_la_SOURCES = mod_auth.c http_auth.c
       
   211 -mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   212 +mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   213  mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
       
   214  
       
   215  lib_LTLIBRARIES += mod_rewrite.la
       
   216  mod_rewrite_la_SOURCES = mod_rewrite.c
       
   217 -mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   218 +mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   219  mod_rewrite_la_LIBADD = $(PCRE_LIB) $(common_libadd)
       
   220  
       
   221  lib_LTLIBRARIES += mod_redirect.la
       
   222  mod_redirect_la_SOURCES = mod_redirect.c
       
   223 -mod_redirect_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   224 +mod_redirect_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   225  mod_redirect_la_LIBADD = $(PCRE_LIB) $(common_libadd)
       
   226  
       
   227  lib_LTLIBRARIES += mod_status.la
       
   228  mod_status_la_SOURCES = mod_status.c
       
   229 -mod_status_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   230 +mod_status_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   231  mod_status_la_LIBADD = $(common_libadd)
       
   232  
       
   233  lib_LTLIBRARIES += mod_accesslog.la
       
   234  mod_accesslog_la_SOURCES = mod_accesslog.c
       
   235 -mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
       
   236 +mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF)
       
   237  mod_accesslog_la_LIBADD = $(common_libadd)
       
   238  
       
   239