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/libxml2/Makefile | 4 +-- package/libxml2/patches/patch-configure | 8 ++--- package/libxml2/patches/patch-ltmain_sh | 11 ------- package/libxml2/patches/patch-threads_c | 53 +++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 17 deletions(-) delete mode 100644 package/libxml2/patches/patch-ltmain_sh create mode 100644 package/libxml2/patches/patch-threads_c (limited to 'package/libxml2') diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index d6cbb4ffb..d8b994ab1 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.7.8 +PKG_VERSION:= 2.9.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8127a65e8c3b08856093099b52599c86 +PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure index f5a2ba355..13406bc62 100644 --- a/package/libxml2/patches/patch-configure +++ b/package/libxml2/patches/patch-configure @@ -1,6 +1,6 @@ ---- libxml2-2.7.8.orig/configure 2010-11-04 18:28:14.000000000 +0100 -+++ libxml2-2.7.8/configure 2011-10-15 15:07:16.000000000 +0200 -@@ -13423,17 +13423,17 @@ case ${host} in +--- libxml2-2.9.1.orig/configure 2013-04-19 09:36:11.000000000 +0200 ++++ libxml2-2.9.1/configure 2013-09-04 15:16:48.000000000 +0200 +@@ -14010,17 +14010,17 @@ case ${host} in esac @@ -22,7 +22,7 @@ else if test -x "$with_python/python.exe" then -@@ -13558,7 +13558,7 @@ else +@@ -14148,7 +14148,7 @@ else PYTHON_SUBDIR= fi diff --git a/package/libxml2/patches/patch-ltmain_sh b/package/libxml2/patches/patch-ltmain_sh deleted file mode 100644 index e5746506c..000000000 --- a/package/libxml2/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libxml2-2.7.8.orig/ltmain.sh 2010-11-04 18:28:10.000000000 +0100 -+++ libxml2-2.7.8/ltmain.sh 2011-04-25 06:55:46.857662605 +0200 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/libxml2/patches/patch-threads_c b/package/libxml2/patches/patch-threads_c new file mode 100644 index 000000000..11b29ac6a --- /dev/null +++ b/package/libxml2/patches/patch-threads_c @@ -0,0 +1,53 @@ +--- libxml2-2.9.1.orig/threads.c 2013-04-05 17:08:04.000000000 +0200 ++++ libxml2-2.9.1/threads.c 2013-09-04 15:17:52.000000000 +0200 +@@ -47,49 +47,7 @@ + #ifdef HAVE_PTHREAD_H + + static int libxml_is_threaded = -1; +-#ifdef __GNUC__ +-#ifdef linux +-#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) +-extern int pthread_once (pthread_once_t *__once_control, +- void (*__init_routine) (void)) +- __attribute((weak)); +-extern void *pthread_getspecific (pthread_key_t __key) +- __attribute((weak)); +-extern int pthread_setspecific (pthread_key_t __key, +- __const void *__pointer) +- __attribute((weak)); +-extern int pthread_key_create (pthread_key_t *__key, +- void (*__destr_function) (void *)) +- __attribute((weak)); +-extern int pthread_key_delete (pthread_key_t __key) +- __attribute((weak)); +-extern int pthread_mutex_init () +- __attribute((weak)); +-extern int pthread_mutex_destroy () +- __attribute((weak)); +-extern int pthread_mutex_lock () +- __attribute((weak)); +-extern int pthread_mutex_unlock () +- __attribute((weak)); +-extern int pthread_cond_init () +- __attribute((weak)); +-extern int pthread_cond_destroy () +- __attribute((weak)); +-extern int pthread_cond_wait () +- __attribute((weak)); +-extern int pthread_equal () +- __attribute((weak)); +-extern pthread_t pthread_self () +- __attribute((weak)); +-extern int pthread_key_create () +- __attribute((weak)); +-extern int pthread_key_delete () +- __attribute((weak)); +-extern int pthread_cond_signal () +- __attribute((weak)); +-#endif +-#endif /* linux */ +-#endif /* __GNUC__ */ ++ + #endif /* HAVE_PTHREAD_H */ + + /* -- cgit v1.2.3