mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 05:21:23 +02:00
dev-libs/libxslt: Sync with Gentoo
It's from Gentoo commit 772b082e7311b6ddc056f1ddc706b579dc59bfd6.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
995563fc58
commit
c4dfbd2e85
@ -1,3 +1 @@
|
||||
DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89
|
||||
DIST libxslt-1.1.42.tar.xz 1573668 BLAKE2B 91b2ca38807ae21b6629b8e19f4ab9d7d19bc0af17f2546e1cf278b2f2fff62b86bbbd996085fff322f3d5ae6c2b20bcfc4e9fb501c301d3fd5d56cf5b205ede SHA512 02a2189b6cd65fa1fb929fc0e6868bc046bdd8827849f0048cdf9267ed9450745158cef0f2713a833e28fb520b312ff86dc5754dd423ce768c457bfd8812bdc7
|
||||
DIST libxslt-1.1.43.tar.xz 1518364 BLAKE2B 84d1cff32c78c4eeff4db614214ee1808bcf958d55711b08e7e2191a4343fb61d38d6b3d9b43f6f12be2dc909fced0a5b5905fa2c5ec7761c83125007e1ce265 SHA512 96110b0397a8f5791f489127574e2143845feb61bea0581d7b7e3c1101fd0718483bae81a7ce417b971bd678293bfd95daddad0dadd3e256c87d41a69faed85a
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
https://bugs.gentoo.org/918973
|
||||
https://gitlab.gnome.org/GNOME/libxslt/-/issues/99
|
||||
https://gitlab.gnome.org/GNOME/libxslt/-/commit/86ec392efd75ce24b79f4baa9822a1b088f3e47f
|
||||
|
||||
From 86ec392efd75ce24b79f4baa9822a1b088f3e47f Mon Sep 17 00:00:00 2001
|
||||
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
||||
Date: Fri, 1 Dec 2023 21:05:19 +0100
|
||||
Subject: [PATCH] tests: Fix build with older libxml2
|
||||
|
||||
Fixes #99.
|
||||
--- a/tests/runtest.c
|
||||
+++ b/tests/runtest.c
|
||||
@@ -456,7 +456,8 @@ initializeLibxml2(void) {
|
||||
xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
|
||||
xmlSetGenericErrorFunc(NULL, testErrorHandler);
|
||||
xsltSetGenericErrorFunc(NULL, testErrorHandler);
|
||||
- xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
|
||||
+ xmlSetStructuredErrorFunc(NULL,
|
||||
+ (xmlStructuredErrorFunc) testStructuredErrorHandler);
|
||||
exsltRegisterAll();
|
||||
xsltRegisterTestModule();
|
||||
xsltMaxDepth = 200;
|
||||
--
|
||||
GitLab
|
||||
@ -1,128 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Note: Please bump this in sync with dev-libs/libxml2.
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
inherit flag-o-matic python-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="XSLT libraries and tools"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
|
||||
inherit autotools git-r3
|
||||
else
|
||||
inherit libtool gnome.org
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="crypt debug examples python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND=">=virtual/pkgconfig-1"
|
||||
RDEPEND="
|
||||
<dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}]
|
||||
crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/xslt-config
|
||||
)
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/libxslt/xsltconfig.h
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-libxml2-2.11-tests.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
eautoreconf
|
||||
else
|
||||
# Prefix always needs elibtoolize if not eautoreconf'd.
|
||||
elibtoolize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Remove this after upstream merge request to add AC_SYS_LARGEFILE lands:
|
||||
# https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/55
|
||||
append-lfs-flags
|
||||
|
||||
libxslt_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--without-python \
|
||||
$(use_with crypt crypto) \
|
||||
$(use_with debug) \
|
||||
$(use_enable static-libs static) \
|
||||
"$@"
|
||||
}
|
||||
|
||||
# Build Python bindings separately
|
||||
libxslt_configure --without-python
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
NATIVE_BUILD_DIR="${BUILD_DIR}"
|
||||
python_foreach_impl run_in_build_dir libxslt_configure --with-python
|
||||
fi
|
||||
}
|
||||
|
||||
libxslt_py_emake() {
|
||||
pushd "${BUILD_DIR}"/python >/dev/null || die
|
||||
|
||||
emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
|
||||
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake all
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake check
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
# "default" does not work here - docs are installed by multilib_src_install_all
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
|
||||
# Hack until automake release is made for the optimise fix
|
||||
# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
|
||||
python_foreach_impl python_optimize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if ! use examples ; then
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
|
||||
fi
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
}
|
||||
@ -1,123 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Note: Please bump this in sync with dev-libs/libxml2.
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
inherit python-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="XSLT libraries and tools"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
|
||||
inherit autotools git-r3
|
||||
else
|
||||
inherit libtool gnome.org
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="crypt debug examples python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND=">=virtual/pkgconfig-1"
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}]
|
||||
crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/xslt-config
|
||||
)
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/libxslt/xsltconfig.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
eautoreconf
|
||||
else
|
||||
# Prefix always needs elibtoolize if not eautoreconf'd.
|
||||
elibtoolize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
libxslt_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--without-python \
|
||||
$(use_with crypt crypto) \
|
||||
$(use_with debug) \
|
||||
$(use_enable static-libs static) \
|
||||
"$@"
|
||||
}
|
||||
|
||||
# Build Python bindings separately
|
||||
libxslt_configure --without-python
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
NATIVE_BUILD_DIR="${BUILD_DIR}"
|
||||
python_foreach_impl run_in_build_dir libxslt_configure --with-python
|
||||
fi
|
||||
}
|
||||
|
||||
libxslt_py_emake() {
|
||||
pushd "${BUILD_DIR}"/python >/dev/null || die
|
||||
|
||||
emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
|
||||
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake all
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake check
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
# "default" does not work here - docs are installed by multilib_src_install_all
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl run_in_build_dir libxslt_py_emake \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
|
||||
# Hack until automake release is made for the optimise fix
|
||||
# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
|
||||
python_foreach_impl python_optimize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if ! use examples ; then
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
|
||||
fi
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
}
|
||||
@ -5,7 +5,7 @@ EAPI=8
|
||||
|
||||
# Note: Please bump this in sync with dev-libs/libxml2.
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
inherit python-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="XSLT libraries and tools"
|
||||
@ -25,11 +25,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND=">=virtual/pkgconfig-1"
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libxml2-2.13:2=[${MULTILIB_USEDEP}]
|
||||
crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}]
|
||||
>=dev-libs/libxml2-2.13:2=[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -5,7 +5,7 @@ EAPI=8
|
||||
|
||||
# Note: Please bump this in sync with dev-libs/libxml2.
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
inherit python-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="XSLT libraries and tools"
|
||||
@ -25,11 +25,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND=">=virtual/pkgconfig-1"
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libxml2-2.13:2=[${MULTILIB_USEDEP}]
|
||||
crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}]
|
||||
>=dev-libs/libxml2-2.13:2=[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user