diff options
Diffstat (limited to 'patches/httpd-2.0.58/httpd-2.0.58-expat-tweak.diff')
-rw-r--r-- | patches/httpd-2.0.58/httpd-2.0.58-expat-tweak.diff | 235 |
1 files changed, 235 insertions, 0 deletions
diff --git a/patches/httpd-2.0.58/httpd-2.0.58-expat-tweak.diff b/patches/httpd-2.0.58/httpd-2.0.58-expat-tweak.diff new file mode 100644 index 000000000..1a46c5fdc --- /dev/null +++ b/patches/httpd-2.0.58/httpd-2.0.58-expat-tweak.diff @@ -0,0 +1,235 @@ +# +# Submitted-By: Robert Schwebel, 2006-02-27 +# Committed-By: Robert Schwebel +# +# Error: +# +# /usr/lib/libexpat.so: could not read symbols: File in wrong format +# +# Description: +# +# Libtool doesn't cope with SYSROOT, so if it gets -lexpat it doesn't +# search it in $SYSROOT/somewhere but in /. +# +# State: +# +# This is just a quirk, so don't feed upstream. Nevertheless, I've no +# idea how to do it correctly. +# + +diff -urN httpd-2.0.58-orig/srclib/apr-util/configure httpd-2.0.58/srclib/apr-util/configure +--- httpd-2.0.58-orig/srclib/apr-util/configure 2006-04-24 20:30:34.000000000 +0200 ++++ httpd-2.0.58/srclib/apr-util/configure 2006-06-20 11:08:08.000000000 +0200 +@@ -25040,42 +25040,42 @@ + if test -r "$abs_expatdir/lib/expat.h.in"; then + expat_include_dir="$abs_expatdir/lib" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib/libexpat.la"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib64/libexpat.la"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib64" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib64/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + elif test -r "$abs_expatdir/xmlparse.h"; then + expat_include_dir="$abs_expatdir" + expat_ldflags="-L$abs_expatdir" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/libexpat.la" + expat_old=yes + elif test -r "$abs_expatdir/include/xmlparse.h" -a \ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/include/xml/xmlparse.h" -a \ + -r "$abs_expatdir/lib/xml/libexpat.a"; then + expat_include_dir="$abs_expatdir/include/xml" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/include/xmltok/xmlparse.h"; then + expat_include_dir="$abs_expatdir/include/xmltok" +@@ -25086,12 +25086,12 @@ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include/xml" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/xmlparse/xmlparse.h"; then + expat_include_dir="$abs_expatdir/xmlparse" + expat_ldflags="-L$abs_expatdir" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + fi + +@@ -25114,42 +25114,42 @@ + if test -r "$abs_expatdir/lib/expat.h.in"; then + expat_include_dir="$abs_expatdir/lib" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib/libexpat.la"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib64/libexpat.la"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib64" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/lib64/libexpat.la" + elif test -r "$abs_expatdir/include/expat.h" -a \ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + elif test -r "$abs_expatdir/xmlparse.h"; then + expat_include_dir="$abs_expatdir" + expat_ldflags="-L$abs_expatdir" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$abs_expatdir/libexpat.la" + expat_old=yes + elif test -r "$abs_expatdir/include/xmlparse.h" -a \ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/include/xml/xmlparse.h" -a \ + -r "$abs_expatdir/lib/xml/libexpat.a"; then + expat_include_dir="$abs_expatdir/include/xml" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/include/xmltok/xmlparse.h"; then + expat_include_dir="$abs_expatdir/include/xmltok" +@@ -25160,12 +25160,12 @@ + -r "$abs_expatdir/lib/libexpat.a"; then + expat_include_dir="$abs_expatdir/include/xml" + expat_ldflags="-L$abs_expatdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$abs_expatdir/xmlparse/xmlparse.h"; then + expat_include_dir="$abs_expatdir/xmlparse" + expat_ldflags="-L$abs_expatdir" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + fi + +@@ -25197,42 +25197,42 @@ + if test -r "$d/lib/expat.h.in"; then + expat_include_dir="$d/lib" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$d/lib/libexpat.la" + elif test -r "$d/include/expat.h" -a \ + -r "$d/lib/libexpat.la"; then + expat_include_dir="$d/include" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$d/lib/libexpat.la" + elif test -r "$d/include/expat.h" -a \ + -r "$d/lib64/libexpat.la"; then + expat_include_dir="$d/include" + expat_ldflags="-L$d/lib64" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$d/lib64/libexpat.la" + elif test -r "$d/include/expat.h" -a \ + -r "$d/lib/libexpat.a"; then + expat_include_dir="$d/include" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + elif test -r "$d/xmlparse.h"; then + expat_include_dir="$d" + expat_ldflags="-L$d" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool="$d/libexpat.la" + expat_old=yes + elif test -r "$d/include/xmlparse.h" -a \ + -r "$d/lib/libexpat.a"; then + expat_include_dir="$d/include" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$d/include/xml/xmlparse.h" -a \ + -r "$d/lib/xml/libexpat.a"; then + expat_include_dir="$d/include/xml" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$d/include/xmltok/xmlparse.h"; then + expat_include_dir="$d/include/xmltok" +@@ -25243,12 +25243,12 @@ + -r "$d/lib/libexpat.a"; then + expat_include_dir="$d/include/xml" + expat_ldflags="-L$d/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + elif test -r "$d/xmlparse/xmlparse.h"; then + expat_include_dir="$d/xmlparse" + expat_ldflags="-L$d" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_old=yes + fi + +@@ -25398,7 +25398,7 @@ + + expat_include_dir=$top_builddir/$bundled_subdir/lib + expat_ldflags="-L$top_builddir/$bundled_subdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la + APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`" + +@@ -25535,7 +25535,7 @@ + + expat_include_dir=$top_builddir/$bundled_subdir/lib + expat_ldflags="-L$top_builddir/$bundled_subdir/lib" +- expat_libs="-lexpat" ++ expat_libs="-Wl,-lexpat" + expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la + APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`" + |