diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /eclass/xorg-3.eclass | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'eclass/xorg-3.eclass')
| -rw-r--r-- | eclass/xorg-3.eclass | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index c68b3041629a..d7ff91417caf 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -152,6 +152,14 @@ BDEPEND+=" ${EAUTORECONF_DEPENDS}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND +# @ECLASS_VARIABLE: FONT_DIR +# @PRE_INHERIT +# @DESCRIPTION: +# If you're creating a font package and the suffix of PN is not equal to +# the subdirectory of /usr/share/fonts/ it should install into, set +# FONT_DIR to that directory or directories. Set before inheriting this +# eclass. + if [[ ${FONT} == yes ]]; then RDEPEND+=" media-fonts/encodings >=x11-apps/mkfontscale-1.2.0" @@ -160,13 +168,6 @@ if [[ ${FONT} == yes ]]; then >=x11-apps/mkfontscale-1.2.0" BDEPEND+=" x11-apps/bdftopcf" - # @ECLASS_VARIABLE: FONT_DIR - # @PRE_INHERIT - # @DESCRIPTION: - # If you're creating a font package and the suffix of PN is not equal to - # the subdirectory of /usr/share/fonts/ it should install into, set - # FONT_DIR to that directory or directories. Set before inheriting this - # eclass. [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} # Fix case of font directories @@ -336,9 +337,12 @@ xorg-3_flags_setup() { # Win32 require special define [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ - # hardened ldflags - [[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] \ - && append-ldflags -Wl,-z,lazy + + # Hardened flags break module autoloading et al (also fixes #778494) + if [[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]]; then + filter-flags -fno-plt + append-ldflags -Wl,-z,lazy + fi # Quite few libraries fail on runtime without these: if has static-libs ${IUSE//+}; then @@ -352,6 +356,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${econfargs[@]}" } +# @VARIABLE: XORG_CONFIGURE_OPTIONS +# @DESCRIPTION: +# Array of an additional options to pass to configure. +# @DEFAULT_UNSET + # @FUNCTION: xorg-3_src_configure # @DESCRIPTION: # Perform any necessary pre-configuration steps, then run configure @@ -360,10 +369,6 @@ xorg-3_src_configure() { xorg-3_flags_setup - # @VARIABLE: XORG_CONFIGURE_OPTIONS - # @DESCRIPTION: - # Array of an additional options to pass to configure. - # @DEFAULT_UNSET local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}") local FONT_OPTIONS=() |