[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     4bdf5e4dd7f94ec68f7fb3c5b69f84e09dfbf087
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 17:18:04 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 17:21:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdf5e4d

xorg-3.eclass: pass --with-fontrootdir to configure

The XORG_FONTROOTDIR autoconf macro calls pkg-config to obtain the
fontrootdir path defined in fontutil.pc.

pkgconf automatically prepends SYSROOT to variable values that start
with a "/". For installation paths, we don't want SYSROOT prepended.

Passing --with-fontrootdir bypasses the pkg-config call and avoids the
problem with SYSROOT.

Bug: https://bugs.gentoo.org/815520
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/xorg-3.eclass | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index cfa679b766c..41732e289b9 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -275,7 +275,7 @@ xorg-3_src_unpack() {
                unpack ${A}
        fi
 
-       [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
+       [[ -n ${FONT} ]] && einfo "Detected font directory: ${FONT_DIR}"
 }
 
 # @FUNCTION: xorg-3_reconf_source
@@ -317,13 +317,17 @@ xorg-3_src_prepare() {
 xorg-3_font_configure() {
        debug-print-function ${FUNCNAME} "$@"
 
+       # Pass --with-fontrootdir to override pkgconf SYSROOT behavior.
+       # https://bugs.gentoo.org/815520
+       if grep -q -s "with-fontrootdir" "${ECONF_SOURCE:-.}"/configure; then
+               FONT_OPTIONS+=( --with-fontrootdir="${EPREFIX}"/usr/share/fonts 
)
+       fi
+
        if has nls ${IUSE//+} && ! use nls; then
                if ! grep -q -s "disable-all-encodings" 
${ECONF_SOURCE:-.}/configure; then
                        die "--disable-all-encodings option not available in 
configure"
                fi
-               FONT_OPTIONS+="
-                       --disable-all-encodings
-                       --enable-iso8859-1"
+               FONT_OPTIONS+=( --disable-all-encodings --enable-iso8859-1 )
        fi
 }
 
@@ -365,6 +369,7 @@ xorg-3_src_configure() {
        # @DEFAULT_UNSET
        local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
 
+       local FONT_OPTIONS=()
        [[ -n "${FONT}" ]] && xorg-3_font_configure
 
        # Check if package supports disabling of dep tracking
@@ -388,7 +393,7 @@ xorg-3_src_configure() {
                ${dep_track}
                ${selective_werror}
                ${no_static}
-               ${FONT_OPTIONS}
+               "${FONT_OPTIONS[@]}"
                "${xorgconfadd[@]}"
        )