diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /eclass/xorg-3.eclass | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'eclass/xorg-3.eclass')
| -rw-r--r-- | eclass/xorg-3.eclass | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index ece4d97b4339..811168ead986 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -169,28 +169,6 @@ if [[ ${FONT} == yes ]]; then FONT_DIR=${FONT_DIR/type1/Type1} FONT_DIR=${FONT_DIR/speedo/Speedo} fi - -# @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 - BDEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI @@ -391,9 +369,15 @@ xorg-3_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 econfargs=( ${dep_track} ${selective_werror} + ${no_static} ${FONT_OPTIONS} "${xorgconfadd[@]}" ) @@ -446,6 +430,7 @@ xorg-3_src_install() { multilib-minimal_src_install "$@" else emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed" + einstalldocs fi # Many X11 libraries unconditionally install developer documentation |