diff options
Diffstat (limited to 'eclass/xorg-2.eclass')
| -rw-r--r-- | eclass/xorg-2.eclass | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index c703d06f1dbd..99b1f891b998 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-2.eclass @@ -119,7 +119,7 @@ fi # Set up autotools shared dependencies # Remember that all versions here MUST be stable -XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt" +XORG_EAUTORECONF_ARCHES="x86-winnt" EAUTORECONF_DEPEND+=" >=sys-devel/libtool-2.2.6a sys-devel/m4" @@ -168,27 +168,6 @@ fi # If we're a driver package, then enable DRIVER case [[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" -# @ECLASS-VARIABLE: XORG_STATIC -# @DESCRIPTION: -# Enables static-libs useflag. Set to no, if your package gets: -# -# QA: configure: WARNING: unrecognized options: --disable-static -: ${XORG_STATIC:="yes"} - -# Add static-libs useflag where useful. -if [[ ${XORG_STATIC} == yes \ - && ${FONT} != yes \ - && ${CATEGORY} != app-doc \ - && ${CATEGORY} != x11-apps \ - && ${CATEGORY} != x11-drivers \ - && ${CATEGORY} != media-fonts \ - && ${PN} != util-macros \ - && ${PN} != xbitmaps \ - && ${PN} != xorg-cf-files \ - && ${PN/xcursor} = ${PN} ]]; then - IUSE+=" static-libs" -fi - DEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI @@ -440,9 +419,15 @@ xorg-2_src_configure() { local selective_werror="--disable-selective-werror" fi + # Check if package supports disabling of static libraries + if grep -q -s "able-static" ${ECONF_SOURCE:-.}/configure; then + local no_static="--disable-static" + fi + local myeconfargs=( ${dep_track} ${selective_werror} + ${no_static} ${FONT_OPTIONS} "${xorgconfadd[@]}" ) |