18908082 some apache2 modules don't build on 49
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 05 Jun 2014 14:04:04 -0700
changeset 1936 185320167a36
parent 1935 0060df5060fa
child 1937 0603d23a9e17
18908082 some apache2 modules don't build on 49
components/apache2-modules/mod_perl/resolve.deps
components/apache2-modules/mod_security2/resolve.deps
components/apr-1_5/patches/libtool.m4.patch
--- a/components/apache2-modules/mod_perl/resolve.deps	Thu Jun 05 14:00:37 2014 -0700
+++ b/components/apache2-modules/mod_perl/resolve.deps	Thu Jun 05 14:04:04 2014 -0700
@@ -1,5 +1,7 @@
 library/apr-13
+library/apr-15
 library/apr-util-13
+library/apr-util-15
 runtime/perl-512
 system/library
 system/library/math
--- a/components/apache2-modules/mod_security2/resolve.deps	Thu Jun 05 14:00:37 2014 -0700
+++ b/components/apache2-modules/mod_security2/resolve.deps	Thu Jun 05 14:04:04 2014 -0700
@@ -1,5 +1,7 @@
 library/apr-13
+library/apr-15
 library/apr-util-13
+library/apr-util-15
 library/libxml2
 library/pcre
 runtime/lua
--- a/components/apr-1_5/patches/libtool.m4.patch	Thu Jun 05 14:00:37 2014 -0700
+++ b/components/apr-1_5/patches/libtool.m4.patch	Thu Jun 05 14:04:04 2014 -0700
@@ -23,3 +23,23 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
[email protected]@ -5439,18 +5452,12 @@
+ 	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+       else
+ 	case `$CC -V 2>&1` in
+-	*"Compilers 5.0"*)
++	*)
+ 	  wlarc=''
+ 	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ 	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ 	  ;;
+-	*)
+-	  wlarc='${wl}'
+-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+-	  ;;
+ 	esac
+       fi
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'