diff options
author | Sam James <sam@gentoo.org> | 2021-07-14 05:51:06 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-07-14 05:52:57 +0100 |
commit | 2275340eb63f5f974ad11fb14040cdf7f89d0551 (patch) | |
tree | b69990c6c6dd5c34c32a5c56a85b015eb34c52bb /dev-libs/libxml2 | |
parent | dev-libs/newt: fix libcrypt QA warning false positive (diff) | |
download | gentoo-2275340eb63f5f974ad11fb14040cdf7f89d0551.tar.gz gentoo-2275340eb63f5f974ad11fb14040cdf7f89d0551.tar.bz2 gentoo-2275340eb63f5f974ad11fb14040cdf7f89d0551.zip |
dev-libs/libxml2: fix libcrypt QA warning false positive
Closes: https://bugs.gentoo.org/798942
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r-- | dev-libs/libxml2/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.9.12-r4.ebuild | 254 |
2 files changed, 255 insertions, 0 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 92c97c365e08..282d68582d11 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -2,6 +2,7 @@ DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8 +DIST libxml2-2.9.12-r4-patchset.tar.bz2 7006 BLAKE2B 64225a16346bff60f2bf3b6d32dffeec6887c44d308dd816d6de3b92ee7f7dd5599b5dfdae0b6ca9e056897c17b659ff36d170f972e1b6043ca3ec8de9c65050 SHA512 ca0734c894afc264851107c22a606b9094941a4452a946b769d6f7161b3301425da5bd3e26eeceb4e31e9721f76505aacf73eeaffa6699bb7395783915eff111 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild new file mode 100644 index 000000000000..975c32047f33 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Note: Please bump in sync with dev-libs/libxslt + +PATCHSET_VERSION="2.9.12-r4-patchset" + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="xml" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc +inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20130923.tar.gz" +DESCRIPTION="XML C parser and toolkit" +HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +SRC_URI=" + ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2 + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + https://www.w3.org/XML/Test/${XMLCONF_TARBALL} + ) + verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) +" +S="${WORKDIR}/${PN}-${PV%_rc*}" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug examples icu ipv6 lzma +python readline static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + dev-util/gtk-doc-am + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-danielveillard ) +" +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) + +PATCHES=( + ## Gentoo + # Patches needed for prefix support + "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch + + # Fix python detection, bug #567066 + # https://bugzilla.gnome.org/show_bug.cgi?id=760458 + "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch + + # Fix python tests when building out of tree #565576 + "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch + + # bug #745162 + "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch + + # Avoid failure on missing fuzz.h when running tests + "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch + + # Respect LDFLAGS fully + "${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch + + ## Upstream + # Fix lxml compatibility (bug #790737) + "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch + # Fix serialising empty HTML documents (bug #794733) + "${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch +) + +src_unpack() { + local tarname=${P/_rc/-rc}.tar.gz + + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} + fi + + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2 + + cd "${S}" || die + + if use test ; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c + + if [[ ${CHOST} == *-darwin* ]] ; then + # Avoid final linking arguments for python modules + sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die + # gcc-apple doesn't grok -Wno-array-bounds + sed -i -e 's/-Wno-array-bounds//' configure.ac || die + fi + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + # We now need to run eautoreconf at the end to prevent maintainer mode. + #elibtoolize + eautoreconf +} + +multilib_src_configure() { + # Filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # Notes: + # 1) USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). + # + # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + # + # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). + + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-subdir=${PF}/html \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable ipv6) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + libxml2_py_configure() { + # Ensure python build dirs exist + mkdir -p "${BUILD_DIR}" || die + + # Odd build system, also see bug #582130 + run_in_build_dir libxml2_configure \ + "--with-python=${EPYTHON}" \ + "--with-python-install-dir=$(python_get_sitedir)" + } + + # Build python bindings separately + libxml2_configure --without-python + + if multilib_is_native_abi && use python ; then + python_foreach_impl libxml2_py_configure + fi +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + + emake "$@" + + popd > /dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + local native_builddir="${BUILD_DIR}" + + python_foreach_impl libxml2_py_emake \ + top_builddir="${native_builddir}" \ + all + fi +} + +multilib_src_test() { + ln -s "${S}"/xmlconf || die + + emake check + + if multilib_is_native_abi && use python ; then + python_foreach_impl libxml2_py_emake test + fi +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ + install + + if multilib_is_native_abi && use python ; then + python_foreach_impl libxml2_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + rm -rf "${ED}"/usr/share/doc/${P} + + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ -n "${ROOT}" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # Need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}/etc/xml/catalog" + + # We don't want to clobber an existing catalog though, + # only ensure that one is there + # <obz@gentoo.org> + if [[ ! -e "${CATALOG}" ]]; then + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} |