diff --git a/srcpkgs/libxml2/patches/libxml2-pthread.patch b/srcpkgs/libxml2/patches/libxml2-pthread.patch new file mode 100644 index 0000000000..b0467f15a5 --- /dev/null +++ b/srcpkgs/libxml2/patches/libxml2-pthread.patch @@ -0,0 +1,53 @@ +--- threads.c 2013-07-24 03:30:55.160000003 +0000 ++++ threads.c 2013-07-24 03:33:50.323000003 +0000 +@@ -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 */ + + /* diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 20d877f01b..cfd3fd02fb 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,7 +1,7 @@ # Template build file for 'libxml2'. pkgname=libxml2 version=2.9.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-threads --with-history" makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel python-devel" @@ -28,7 +28,7 @@ post_install() { } libxml2-devel_package() { - depends="zlib-devel libxml2>=${version}" + depends="zlib-devel libxml2>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -40,6 +40,7 @@ libxml2-devel_package() { vmove usr/share/doc/${sourcepkg}-${version} vmove "usr/share/man/man1/xml2-config*" vmove usr/share/man/man3 + vmove "usr/lib/*.so" } }