summaryrefslogtreecommitdiff
path: root/package/libxml2
diff options
context:
space:
mode:
Diffstat (limited to 'package/libxml2')
-rw-r--r--package/libxml2/Makefile63
-rw-r--r--package/libxml2/patches/patch-configure_in87
-rw-r--r--package/libxml2/patches/patch-python_Makefile_am17
-rw-r--r--package/libxml2/patches/patch-threads_c53
4 files changed, 20 insertions, 200 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 7095a6c3a..5a7c744cb 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -1,60 +1,41 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libxml2
-PKG_VERSION:= 2.9.1
-PKG_RELEASE:= 6
-PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
+PKG_VERSION:= 2.15.1
+PKG_RELEASE:= 1
+PKG_HASH:= c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c
PKG_DESCR:= xml parser and toolkit
PKG_SECTION:= libs/data
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= libxml2-host zlib
-HOST_BUILDDEP:= python2-host
+PKG_BUILDDEP:= libxml2-host python3 zlib
+HOST_BUILDDEP:= python3-host
PKG_URL:= http://www.xmlsoft.org/
-PKG_SITES:= http://xmlsoft.org/sources/
+PKG_SITES:= https://download.gnome.org/sources/libxml2/2.15/
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
-PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
-PKGSD_LIBXML2_PYTHON:= XML python bindings
-PKGSC_LIBXML2_PYTHON:= libs/misc
-PKGSB_LIBXML2_PYTHON:= python2
-PKGSS_LIBXML2_PYTHON:= python2
+$(eval $(call HOST_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call HOST_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_PYTHON},${PKGSC_LIBXML2_PYTHON}))
-
-include $(ADK_TOPDIR)/mk/python.mk
-
-HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS+= --with-python \
+HOST_CONFIGURE_ARGS+= --without-python \
+ --with-threads \
--without-iconv \
--without-lzma \
--without-zlib
-HOST_MAKE_FLAGS+= LDFLAGS=-lpthread
-AUTOTOOL_STYLE:= autoreconf
-TARGET_LDFLAGS+= -lpthread
-ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),)
-CONFIGURE_ARGS+= --with-python
-else
-CONFIGURE_ARGS+= --without-python
-endif
CONFIGURE_ARGS+= --without-c14n \
--without-debug \
- --without-docbook \
--with-catalog \
--with-html \
--without-ftp \
--without-http \
--without-iconv \
+ --without-lzma \
--without-iso8859x \
--without-legacy \
--with-output \
@@ -72,16 +53,12 @@ CONFIGURE_ARGS+= --without-c14n \
--with-xinclude \
--with-xpath \
--with-xptr \
- --with-zlib
+ --without-python \
+ --with-zlib='$(STAGING_TARGET_DIR)/usr'
libxml2-install:
- ${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBXML2)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libxml2.so* $(IDIR_LIBXML2)/usr/lib
-libxml2-python-install:
- $(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
- $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.{so,py} \
- $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in
deleted file mode 100644
index 6432ced20..000000000
--- a/package/libxml2/patches/patch-configure_in
+++ /dev/null
@@ -1,87 +0,0 @@
---- libxml2-2.9.1.orig/configure.in 2013-04-19 09:25:20.000000000 +0200
-+++ libxml2-2.9.1/configure.in 2013-11-23 23:02:06.000000000 +0100
-@@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
- if test "$with_python" != "no" ; then
-- if test -x "$with_python/bin/python"
-- then
-- echo Found python in $with_python/bin/python
-- PYTHON="$with_python/bin/python"
-- else
-- if test -x "$with_python/python.exe"
-- then
-- echo Found python in $with_python/python.exe
-- PYTHON="$with_python/python.exe"
-- else
-- if test -x "$with_python"
-- then
-- echo Found python in $with_python
-- PYTHON="$with_python"
-- else
-- if test -x "$PYTHON"
-- then
-- echo Found python in environment PYTHON=$PYTHON
-- with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
-- else
-- AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
-- fi
-- fi
-- fi
-- fi
-+ AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
- if test "$PYTHON" != ""
- then
- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
-- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`
--# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python
--#
--# PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
- echo Found Python version $PYTHON_VERSION
- fi
-- if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
-- then
-- if test -r $with_python/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
-- else
-- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
-- else
-- if test -r /usr/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
-- else
-- if test -r $with_python/include/Python.h
-- then
-- PYTHON_INCLUDES=$with_python/include
-- else
-- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
-- fi
-- fi
-- fi
-- fi
-- fi
-- if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
-- then
-- if test -d $libdir/python$PYTHON_VERSION/site-packages
-- then
-- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
-- else
-- if test -d $with_python/lib/site-packages
-- then
-- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
-- else
-- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
-- fi
-- fi
-- fi
-- pythondir='$(PYTHON_SITE_PACKAGES)'
-+ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes`
- PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
-+ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages
-+ pythondir='$(PYTHON_SITE_PACKAGES)'
- else
- PYTHON=
- fi
diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am
deleted file mode 100644
index 82061eee3..000000000
--- a/package/libxml2/patches/patch-python_Makefile_am
+++ /dev/null
@@ -1,17 +0,0 @@
---- libxml2-2.9.1.orig/python/Makefile.am 2013-04-19 08:56:45.000000000 +0200
-+++ libxml2-2.9.1/python/Makefile.am 2013-11-24 09:18:44.000000000 +0100
-@@ -19,12 +19,12 @@ if WITH_PYTHON
- AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
-- -I$(PYTHON_INCLUDES)
-+ $(PYTHON_INCLUDES)
-
- python_LTLIBRARIES = libxml2mod.la
-
- libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
--libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
-+libxml2mod_la_LDFLAGS = $(LDFLAGS) $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
- $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
-
- BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
diff --git a/package/libxml2/patches/patch-threads_c b/package/libxml2/patches/patch-threads_c
deleted file mode 100644
index 11b29ac6a..000000000
--- a/package/libxml2/patches/patch-threads_c
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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 */
-
- /*
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 08:35:04 +0000