Skip to content

Commit

Permalink
xorg-3.eclass: Ensures WANT_* are defined before inheriting.
Browse files Browse the repository at this point in the history
Fixes compatibility with the updated autotools.eclass.

Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com>
  • Loading branch information
pinkflames committed Mar 28, 2021
1 parent bb0f1de commit abd3b30
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions eclass/xorg-3.eclass
Expand Up @@ -47,6 +47,10 @@ fi
# before inheriting this eclass.
: ${XORG_MULTILIB:="no"}

# Due to changes to autotools.eclass, we need to define some variables before inheriting
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"

# we need to inherit autotools first to get the deps
inherit autotools libtool multilib toolchain-funcs flag-o-matic \
${FONT_ECLASS} ${GIT_ECLASS}
Expand Down Expand Up @@ -136,8 +140,6 @@ if [[ ${PN} != util-macros ]] ; then
# Required even by xorg-server
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
fi
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
for arch in ${XORG_EAUTORECONF_ARCHES}; do
EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
done
Expand Down Expand Up @@ -325,7 +327,7 @@ xorg-3_flags_setup() {

# Win32 require special define
[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
# hardened ldflags
# hardened ldflags (also see #778494)
[[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] \
&& filter-flags -fno-plt && append-ldflags -Wl,-z,lazy

Expand Down

0 comments on commit abd3b30

Please sign in to comment.