mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-21 06:28:06 +02:00
65a031f4c9
When cross compiling by setting the ROOT variable, the eclass was
writing the full EROOT path into the catalog file. This results in an
invalid path at runtime.
i.e.,
$ cat /build/amd64-host/etc/sgml/catalog
CATALOG "/build/amd64-host/etc/sgml/sgml-docbook.cat"
CATALOG "/build/amd64-host/etc/sgml/sgml-ent.cat"
CATALOG "/build/amd64-host/etc/sgml/xml-docbook-4.1.2.cat"
Instead we should be stripping off the ROOT so we get a valid path:
$ cat /build/amd64-host/etc/sgml/catalog
CATALOG "/etc/sgml/sgml-docbook.cat"
CATALOG "/etc/sgml/sgml-ent.cat"
CATALOG "/etc/sgml/xml-docbook-4.1.2.cat"
We don't strip EROOT because we want to keep the prefix if it's
present.
Closes: https://bugs.gentoo.org/903747
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/30462
Signed-off-by: Michał Górny <mgorny@gentoo.org>
68 lines
1.8 KiB
Bash
68 lines
1.8 KiB
Bash
# Copyright 2019-2023 Gentoo Authors
|
|
# Distributed under the terms of the GNU General Public License v2
|
|
|
|
# @ECLASS: sgml-catalog-r1.eclass
|
|
# @MAINTAINER:
|
|
# Michał Górny <mgorny@gentoo.org>
|
|
# @AUTHOR:
|
|
# Michał Górny <mgorny@gentoo.org>
|
|
# @SUPPORTED_EAPIS: 7
|
|
# @BLURB: Functions for installing SGML catalogs
|
|
# @DESCRIPTION:
|
|
# This eclass regenerates /etc/sgml/catalog as necessary for the DocBook
|
|
# tooling. This is done via exported pkg_postinst and pkg_postrm phases.
|
|
|
|
case ${EAPI} in
|
|
7) ;;
|
|
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
|
esac
|
|
|
|
if [[ -z ${_SGML_CATALOG_R1_ECLASS} ]]; then
|
|
_SGML_CATALOG_R1_ECLASS=1
|
|
|
|
if [[ ${CATEGORY}/${PN} != app-text/sgml-common ]]; then
|
|
RDEPEND=">=app-text/sgml-common-0.6.3-r7"
|
|
fi
|
|
|
|
# @FUNCTION: sgml-catalog-r1_update_catalog
|
|
# @DESCRIPTION:
|
|
# Regenerate /etc/sgml/catalog to include all installed catalogs.
|
|
sgml-catalog-r1_update_catalog() {
|
|
local shopt_save=$(shopt -p nullglob)
|
|
shopt -s nullglob
|
|
local cats=( "${EROOT}"/etc/sgml/*.cat )
|
|
${shopt_save}
|
|
|
|
if [[ ${#cats[@]} -gt 0 ]]; then
|
|
ebegin "Updating ${EROOT}/etc/sgml/catalog"
|
|
printf 'CATALOG "%s"\n' "${cats[@]#${ROOT}}" > "${T}"/catalog &&
|
|
mv "${T}"/catalog "${EROOT}"/etc/sgml/catalog
|
|
eend "${?}"
|
|
else
|
|
ebegin "Removing ${EROOT}/etc/sgml/catalog"
|
|
rm "${EROOT}"/etc/sgml/catalog &&
|
|
{ rmdir "${EROOT}"/etc/sgml &>/dev/null || :; }
|
|
eend "${?}"
|
|
fi
|
|
}
|
|
|
|
# @FUNCTION: sgml-catalog-r1_update_env
|
|
# @DESCRIPTION:
|
|
# Remove obsolete environment files. They can break tools such as asciidoc.
|
|
sgml-catalog-r1_update_env() {
|
|
rm -f "${EROOT}"/etc/env.d/93sgmltools-lite "${EROOT}"/etc/sgml/sgml.{,c}env
|
|
}
|
|
|
|
sgml-catalog-r1_pkg_postinst() {
|
|
sgml-catalog-r1_update_catalog
|
|
sgml-catalog-r1_update_env
|
|
}
|
|
|
|
sgml-catalog-r1_pkg_postrm() {
|
|
sgml-catalog-r1_update_catalog
|
|
sgml-catalog-r1_update_env
|
|
}
|
|
|
|
fi
|
|
|
|
EXPORT_FUNCTIONS pkg_postinst pkg_postrm
|