summaryrefslogtreecommitdiff
path: root/package/libxml2/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-10 14:54:31 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-10 14:54:31 -0600
commite5773496ba49a38f3ac019388121f1477aeaca2c (patch)
tree975afaff01daeb36c1a6acb8781237396da720ce /package/libxml2/Makefile
parentf2b3fd174eedf0cd3240b00808d3d3ef0e56e658 (diff)
udpate to latest upstream version
Diffstat (limited to 'package/libxml2/Makefile')
-rw-r--r--package/libxml2/Makefile42
1 files changed, 19 insertions, 23 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