summaryrefslogtreecommitdiff
path: root/package/libxml2
diff options
context:
space:
mode:
Diffstat (limited to 'package/libxml2')
-rw-r--r--package/libxml2/Makefile34
-rw-r--r--package/libxml2/patches/patch-Makefile_am14
-rw-r--r--package/libxml2/patches/patch-configure_ac96
-rw-r--r--package/libxml2/patches/patch-python_Makefile_am12
4 files changed, 7 insertions, 149 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 5835c98d7..20a1428b7 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -4,48 +4,33 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libxml2
-PKG_VERSION:= 2.9.4
+PKG_VERSION:= 2.10.3
PKG_RELEASE:= 1
-PKG_HASH:= ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
+PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
PKG_DESCR:= xml parser and toolkit
PKG_SECTION:= libs/data
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= libxml2-host python2 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.10/
PKG_OPTS:= dev
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
-PKGSD_LIBXML2_PYTHON:= xml python bindings
-PKGSC_LIBXML2_PYTHON:= libs/misc
-PKGSB_LIBXML2_PYTHON:= python2
-PKGSS_LIBXML2_PYTHON:= python2
-
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
-TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/python$(PYTHON_VERSION)
-HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/python$(PYTHON_VERSION)
HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS+= --with-python \
+HOST_CONFIGURE_ARGS+= --without-python \
--with-threads \
--without-iconv \
--without-lzma \
--without-zlib
-AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --without-c14n \
--without-debug \
- --without-docbook \
--with-catalog \
--with-html \
--without-ftp \
@@ -69,17 +54,12 @@ CONFIGURE_ARGS+= --without-c14n \
--with-xinclude \
--with-xpath \
--with-xptr \
- --with-python \
+ --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
-libxml2-python-install:
- $(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages
- $(CP) $(WRKINST)/usr/lib/python/site-packages/*.{so,py} \
- $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages
-
include $(ADK_TOPDIR)/mk/host-bottom.mk
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libxml2/patches/patch-Makefile_am b/package/libxml2/patches/patch-Makefile_am
deleted file mode 100644
index f14a120d9..000000000
--- a/package/libxml2/patches/patch-Makefile_am
+++ /dev/null
@@ -1,14 +0,0 @@
---- libxml2-2.9.2.orig/Makefile.am 2014-10-13 05:02:53.000000000 -0500
-+++ libxml2-2.9.2/Makefile.am 2015-02-11 12:51:49.858163855 -0600
-@@ -2,9 +2,9 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
-+SUBDIRS = include . xstc $(PYTHON_SUBDIR)
-
--DIST_SUBDIRS = include . doc example python xstc
-+DIST_SUBDIRS = include . python xstc
-
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
-
diff --git a/package/libxml2/patches/patch-configure_ac b/package/libxml2/patches/patch-configure_ac
deleted file mode 100644
index 6cbef4845..000000000
--- a/package/libxml2/patches/patch-configure_ac
+++ /dev/null
@@ -1,96 +0,0 @@
---- libxml2-2.9.2.orig/configure.ac 2014-10-15 23:06:15.000000000 -0500
-+++ libxml2-2.9.2/configure.ac 2015-02-11 12:53:35.494162888 -0600
-@@ -837,62 +837,13 @@ if test "$with_python" != "no" ; 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
-- 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
-+ AC_PATH_PROG(PYTHON, python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
- fi
- fi
- fi
- fi
-- if test "$with_python_install_dir" != ""
-- then
-- PYTHON_SITE_PACKAGES="$with_python_install_dir"
-- 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
-+ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes`
-+ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages
- pythondir='$(PYTHON_SITE_PACKAGES)'
- PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
- else
-@@ -1065,26 +1016,7 @@ else
- THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
- ;;
- *linux*)
-- if test "${GCC}" = "yes" ; then
-- GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
-- GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
-- GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\..*++'`
-- if test "${THREAD_LIBS}" = "-lpthread" ; then
-- if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
-- then
-- THREAD_LIBS=""
-- BASE_THREAD_LIBS="-lpthread"
-- else
-- if expr ${GCC_MAJOR} \> 3 > /dev/null
-- then
-- THREAD_LIBS=""
-- BASE_THREAD_LIBS="-lpthread"
-- else
-- echo old GCC disabling weak symbols for pthread
-- fi
-- fi
-- fi
-- fi
-+ THREAD_LIBS="-lpthread"
- ;;
- esac
- if test "$WITH_THREADS" = "1" ; then
diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am
deleted file mode 100644
index b3ac2539b..000000000
--- a/package/libxml2/patches/patch-python_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
---- libxml2-2.9.2.orig/python/Makefile.am 2014-10-03 04:00:53.000000000 -0500
-+++ libxml2-2.9.2/python/Makefile.am 2015-02-11 12:53:07.150163147 -0600
-@@ -18,8 +18,7 @@ EXTRA_DIST = \
- if WITH_PYTHON
- AM_CPPFLAGS = \
- -I$(top_builddir)/include \
-- -I$(top_srcdir)/include \
-- -I$(PYTHON_INCLUDES)
-+ -I$(top_srcdir)/include
-
- python_LTLIBRARIES = libxml2mod.la
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 18:48:16 +0000