diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index 904740982d..3a22c0e994 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -8,26 +8,19 @@ PKG_SHA256="5c3dbade38b64d7fecf628b92b3485868d21516a4a86465294e5919e6aa309a4" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="https://gitlab.gnome.org/GNOME/${PKG_NAME}/-/archive/v${PKG_VERSION}/${PKG_NAME}-v${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_HOST="zlib:host Python3:host" +PKG_DEPENDS_HOST="zlib:host ninja:host Python3:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files." -PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \ - --enable-static \ - --enable-shared \ - --disable-silent-rules \ - --enable-ipv6 \ - --without-lzma" +PKG_CMAKE_OPTS_ALL="-DBUILD_SHARED_LIBS=ON \ + -DLIBXML2_WITH_LZMA=OFF \ + -DLIBXML2_WITH_TESTS=OFF" -PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} \ - --with-zlib=${TOOLCHAIN} \ - --with-python" +PKG_CMAKE_OPTS_HOST="${PKG_CMAKE_OPTS_ALL} \ + -DLIBXML2_WITH_PYTHON=ON" -PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} \ - --with-zlib=${SYSROOT_PREFIX}/usr \ - --without-python \ - --with-sysroot=${SYSROOT_PREFIX}" +PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_ALL} \ + -DLIBXML2_WITH_PYTHON=OFF" post_makeinstall_target() { sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xml2-config diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk index 5c3fef56d6..7c7f3d5d9f 100644 --- a/packages/textproc/libxslt/package.mk +++ b/packages/textproc/libxslt/package.mk @@ -12,23 +12,21 @@ PKG_DEPENDS_HOST="libxml2:host" PKG_DEPENDS_TARGET="toolchain libxml2" PKG_LONGDESC="A XSLT C library." PKG_BUILD_FLAGS="+pic" -PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_HOST=" ac_cv_header_ansidecl_h=no \ - ac_cv_header_xlocale_h=no \ - --enable-static \ - --disable-shared \ - --without-python \ - --with-libxml-prefix=${TOOLCHAIN} \ - --without-crypto" +PKG_CMAKE_OPTS_ALL="-DBUILD_SHARED_LIBS=ON \ + -DLIBXSLT_WITH_DEBUGGER=ON \ + -DLIBXSLT_WITH_CRYPTO=OFF \ + -DLIBXSLT_WITH_MEM_DEBUG=OFF \ + -DLIBXSLT_WITH_MODULES=ON \ + -DLIBXSLT_WITH_PROFILER=ON \ + -DLIBXSLT_WITH_PYTHON=OFF \ + -DLIBXSLT_WITH_TESTS=OFF \ + -DLIBXSLT_WITH_THREADS=ON \ + -DLIBXSLT_WITH_XSLT_DEBUG=ON" -PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \ - ac_cv_header_xlocale_h=no \ - --enable-static \ - --disable-shared \ - --without-python \ - --with-libxml-prefix=${SYSROOT_PREFIX}/usr \ - --without-crypto" +PKG_CMAKE_OPTS_HOST=${PKG_CMAKE_OPTS_ALL} + +PKG_CMAKE_OPTS_TARGET=${PKG_CMAKE_OPTS_ALL} post_makeinstall_target() { sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xslt-config diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk index 09311c05ff..59c859cdac 100644 --- a/packages/textproc/xmlstarlet/package.mk +++ b/packages/textproc/xmlstarlet/package.mk @@ -13,7 +13,6 @@ PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modifica PKG_CONFIGURE_OPTS_HOST=" ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ - --enable-static-libs \ LIBXML_CONFIG=${TOOLCHAIN}/bin/xml2-config \ LIBXSLT_CONFIG=${TOOLCHAIN}/bin/xslt-config \ --with-libxml-include-prefix=${TOOLCHAIN}/include/libxml2 \ @@ -23,7 +22,6 @@ PKG_CONFIGURE_OPTS_HOST=" ac_cv_func_malloc_0_nonnull=yes \ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ - --enable-static-libs \ LIBXML_CONFIG=${SYSROOT_PREFIX}/usr/bin/xml2-config \ LIBXSLT_CONFIG=${SYSROOT_PREFIX}/usr/bin/xslt-config \ --with-libxml-include-prefix=${SYSROOT_PREFIX}/usr/include/libxml2 \