From 6368c7a245a1c75c9314efe3d0764a8a720cf725 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Jun 2023 07:15:18 +0000 Subject: [PATCH] eclass/xorg-3: Sync with Gentoo It's from Gentoo commit fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42. --- .../portage-stable/eclass/xorg-3.eclass | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass index c3ece64ae4..e0b26acca0 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass @@ -273,21 +273,11 @@ xorg-3_src_unpack() { xorg-3_reconf_source() { debug-print-function ${FUNCNAME} "$@" - case ${CHOST} in - *-aix* | *-winnt*) - # some hosts need full eautoreconf - [[ -e "./configure.ac" || -e "./configure.in" ]] \ - && XORG_EAUTORECONF=yes - ;; - *) - # elibtoolize required for BSD - [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \ - && XORG_EAUTORECONF=yes - ;; - esac - - [[ ${XORG_EAUTORECONF} != no ]] && eautoreconf - elibtoolize --patch-only + if [[ ${XORG_EAUTORECONF} != no ]] ; then + eautoreconf + else + elibtoolize --patch-only + fi } # @FUNCTION: xorg-3_src_prepare @@ -326,9 +316,6 @@ xorg-3_font_configure() { xorg-3_flags_setup() { debug-print-function ${FUNCNAME} "$@" - # Win32 require special define - [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ - # 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