summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/libxml2/Makefile42
-rw-r--r--package/libxml2/patches/patch-configure_ac (renamed from package/libxml2/patches/patch-configure_in)89
-rw-r--r--package/libxml2/patches/patch-python_Makefile_am17
3 files changed, 68 insertions, 80 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 294ad23d2..9f5aa9530 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -1,22 +1,22 @@
# 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_HASH:= fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb
+PKG_VERSION:= 2.9.2
+PKG_RELEASE:= 1
+PKG_HASH:= 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc
PKG_DESCR:= xml parser and toolkit
PKG_SECTION:= libs/data
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= libxml2-host zlib
+PKG_BUILDDEP:= libxml2-host python2 zlib
HOST_BUILDDEP:= python2-host
PKG_URL:= http://www.xmlsoft.org/
PKG_SITES:= http://xmlsoft.org/sources/
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
PKGSD_LIBXML2_PYTHON:= XML python bindings
@@ -24,29 +24,23 @@ 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
+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}))
+$(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='$(STAGING_HOST_DIR)/usr' \
+HOST_CONFIGURE_ARGS+= --with-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 \
@@ -55,6 +49,7 @@ CONFIGURE_ARGS+= --without-c14n \
--without-ftp \
--without-http \
--without-iconv \
+ --without-lzma \
--without-iso8859x \
--without-legacy \
--with-output \
@@ -72,16 +67,17 @@ CONFIGURE_ARGS+= --without-c14n \
--with-xinclude \
--with-xpath \
--with-xptr \
+ --with-python \
--with-zlib
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_ac
index 6432ced20..2e7ab8f77 100644
--- a/package/libxml2/patches/patch-configure_in
+++ b/package/libxml2/patches/patch-configure_ac
@@ -1,44 +1,23 @@
---- 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
+--- libxml2-2.9.2.orig/configure.ac 2014-10-15 23:06:15.000000000 -0500
++++ libxml2-2.9.2/configure.ac 2015-02-10 14:34:59.318899232 -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
-+ 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())"`
+- 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
+- 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
@@ -59,9 +38,14 @@
- else
- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
- fi
-- fi
-- fi
-- fi
++ AC_PATH_PROG(PYTHON, 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
@@ -77,11 +61,36 @@
- 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)'
+ pythondir='$(PYTHON_SITE_PACKAGES)'
+ PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
else
- PYTHON=
- fi
+@@ -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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:01:45 +0000