mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-24 20:11:59 +01:00
eclass/xorg-3: Sync with Gentoo
It's from Gentoo commit 6c5bb90fca515fb854e5c567decd7528df32f354.
This commit is contained in:
parent
1c363bf4c4
commit
8569d9123f
@ -58,6 +58,7 @@ fi
|
|||||||
: "${XORG_MULTILIB:="no"}"
|
: "${XORG_MULTILIB:="no"}"
|
||||||
|
|
||||||
# we need to inherit autotools first to get the deps
|
# we need to inherit autotools first to get the deps
|
||||||
|
AUTOTOOLS_AUTO_DEPEND=no
|
||||||
inherit autotools libtool multilib toolchain-funcs flag-o-matic \
|
inherit autotools libtool multilib toolchain-funcs flag-o-matic \
|
||||||
${FONT_ECLASS} ${GIT_ECLASS}
|
${FONT_ECLASS} ${GIT_ECLASS}
|
||||||
unset FONT_ECLASS GIT_ECLASS
|
unset FONT_ECLASS GIT_ECLASS
|
||||||
@ -129,17 +130,13 @@ fi
|
|||||||
|
|
||||||
# Set up autotools shared dependencies
|
# Set up autotools shared dependencies
|
||||||
# Remember that all versions here MUST be stable
|
# Remember that all versions here MUST be stable
|
||||||
EAUTORECONF_DEPEND+="
|
EAUTORECONF_DEPEND+=" ${AUTOTOOLS_DEPEND}"
|
||||||
>=dev-build/libtool-2.2.6a
|
|
||||||
sys-devel/m4"
|
|
||||||
if [[ ${PN} != util-macros ]] ; then
|
if [[ ${PN} != util-macros ]] ; then
|
||||||
EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18"
|
EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18"
|
||||||
# Required even by xorg-server
|
# Required even by xorg-server
|
||||||
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
|
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
|
||||||
fi
|
fi
|
||||||
BDEPEND+=" ${EAUTORECONF_DEPENDS}"
|
|
||||||
[[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
|
[[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
|
||||||
unset EAUTORECONF_DEPENDS
|
|
||||||
unset EAUTORECONF_DEPEND
|
unset EAUTORECONF_DEPEND
|
||||||
|
|
||||||
# @ECLASS_VARIABLE: FONT_DIR
|
# @ECLASS_VARIABLE: FONT_DIR
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user