summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/libxml2/Makefile8
-rw-r--r--package/libxslt/Makefile7
-rw-r--r--scripts/scan-pkgs.sh4
3 files changed, 13 insertions, 6 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index d033af17d..2bac9ea1b 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
PKG_DESCR:= XML C parser and toolkit
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= zlib autotool
+PKG_BUILDDEP:= autotool libxml2-host zlib
PKG_URL:= http://www.xmlsoft.org/
PKG_SITES:= http://xmlsoft.org/sources/
PKG_OPTS:= dev
@@ -24,13 +24,18 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
endif
+include ${TOPDIR}/mk/host.mk
include ${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 $(TOPDIR)/mk/python.mk
+HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --without-python
+
AUTOTOOL_STYLE:= autoreconf
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -lpthread
@@ -75,4 +80,5 @@ libxml2-python-install:
$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.{so,py} \
$(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 3a34c5a63..c9f2ce521 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7
PKG_DESCR:= XSLT Library
PKG_SECTION:= libs
PKG_DEPENDS:= libxml2
-PKG_BUILDDEP:= libxml2
+PKG_BUILDDEP:= python2-host libxml2-host libxslt-host libxml2
PKG_URL:= http://xmlsoft.org/XSLT
PKG_SITES:= http://xmlsoft.org/sources/
PKG_NEED_CXX:= 1
@@ -24,11 +24,15 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
endif
+include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
+$(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
+HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
--with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \
--with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \
@@ -47,4 +51,5 @@ libxslt-install:
${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
${CP} ${WRKINST}/usr/lib/libexslt.so* ${IDIR_LIBXSLT}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b6c932772..cebff9846 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -80,10 +80,6 @@ if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
[ $? -ne 0 ] && out=1
fi
-if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
- NEED_XSLTPROC="$NEED_XSLTPROC libxcb"
-fi
-
if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
fi