From 0d848db3159f5ac24e17a83e749ef5ee9835cb48 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Sep 2013 15:24:03 +0200 Subject: update to latest upstream version, fix musl compile --- package/libxslt/patches/patch-configure | 241 --------------------- package/libxslt/patches/patch-libexslt_Makefile_in | 11 - package/libxslt/patches/patch-ltmain_sh | 11 - package/libxslt/patches/patch-xsltproc_Makefile_in | 11 - 4 files changed, 274 deletions(-) delete mode 100644 package/libxslt/patches/patch-configure delete mode 100644 package/libxslt/patches/patch-libexslt_Makefile_in delete mode 100644 package/libxslt/patches/patch-ltmain_sh delete mode 100644 package/libxslt/patches/patch-xsltproc_Makefile_in (limited to 'package/libxslt/patches') diff --git a/package/libxslt/patches/patch-configure b/package/libxslt/patches/patch-configure deleted file mode 100644 index ea6b0cf6d..000000000 --- a/package/libxslt/patches/patch-configure +++ /dev/null @@ -1,241 +0,0 @@ ---- libxslt-1.1.24.orig/configure 2008-05-13 17:40:54.000000000 +0200 -+++ libxslt-1.1.24/configure 2011-02-15 18:11:46.000000000 +0100 -@@ -6799,238 +6799,6 @@ fi - - - --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } --if test -z "$CXXCPP"; then -- if test "${ac_cv_prog_CXXCPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer to if __STDC__ is defined, since -- # exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include --#else --# include --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CXXCPP=$CXXCPP -- --fi -- CXXCPP=$ac_cv_prog_CXXCPP --else -- ac_cv_prog_CXXCPP=$CXXCPP --fi --{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 --echo "${ECHO_T}$CXXCPP" >&6; } --ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer to if __STDC__ is defined, since -- # exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include --#else --# include --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else -- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- --fi -- -- - ac_ext=f - ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' diff --git a/package/libxslt/patches/patch-libexslt_Makefile_in b/package/libxslt/patches/patch-libexslt_Makefile_in deleted file mode 100644 index 53165a669..000000000 --- a/package/libxslt/patches/patch-libexslt_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/libexslt/Makefile.in 2008-05-13 17:52:13.000000000 +0200 -+++ libxslt-1.1.24/libexslt/Makefile.in 2011-01-11 17:04:29.000000000 +0100 -@@ -247,7 +247,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ - -I$(top_builddir) -I$(top_builddir)/libxslt \ -- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) -+ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) - - AM_CFLAGS = $(LIBGCRYPT_CFLAGS) - lib_LTLIBRARIES = libexslt.la diff --git a/package/libxslt/patches/patch-ltmain_sh b/package/libxslt/patches/patch-ltmain_sh deleted file mode 100644 index 0c416e0cb..000000000 --- a/package/libxslt/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/ltmain.sh 2007-08-29 14:28:46.000000000 +0200 -+++ libxslt-1.1.24/ltmain.sh 2011-01-15 21:29:56.000000000 +0100 -@@ -1663,7 +1663,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/libxslt/patches/patch-xsltproc_Makefile_in b/package/libxslt/patches/patch-xsltproc_Makefile_in deleted file mode 100644 index 3802ce0fa..000000000 --- a/package/libxslt/patches/patch-xsltproc_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/xsltproc/Makefile.in 2008-05-13 17:52:15.000000000 +0200 -+++ libxslt-1.1.24/xsltproc/Makefile.in 2011-01-11 17:06:56.000000000 +0100 -@@ -234,7 +234,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ - -I$(top_builddir) -I$(top_builddir)/libxslt \ -- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) -+ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) - - AM_CFLAGS = $(LIBGCRYPT_CFLAGS) - xsltproc_SOURCES = xsltproc.c -- cgit v1.2.3