PATCH_VER 0.2.1. Add 0430_all_6.8.0-sparc-add-mach64-to-devel-dri-drivers.patch (#63994). This plus other ebuild modifications from that bug should enable sparc guys to use 6.8.0-r1. Ebuild mods include adding hardened flag for sparc to append -fno-PIE and -fno-pie as well as change the assembler command. Also build the deprecated keyboard driver for sparc on kernels != 2.6 and a weird hack to stop a sparc32-SMP compiler bug (#56593).

3 files changed, 42 insertions, 7 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 4d8f27aec8a1..b612759f5d86 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.126 2004/09/18 12:16:26 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.127 2004/09/22 09:06:40 spyderous Exp $
+
+  22 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  PATCH_VER 0.2.1. Add
+  0430_all_6.8.0-sparc-add-mach64-to-devel-dri-drivers.patch (#63994). This plus
+  other ebuild modifications from that bug should enable sparc guys to use
+  6.8.0-r1. Ebuild mods include adding hardened flag for sparc to append
+  -fno-PIE and -fno-pie as well as change the assembler command. Also build the
+  deprecated keyboard driver for sparc on kernels != 2.6 and a weird hack to
+  stop a sparc32-SMP compiler bug (#56593).
 
   18 Sep 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.7.0-r2.ebuild,
   xorg-x11-6.8.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r1
index 4e95dad80ac7..8804921bdf60 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r1
@@ -3,7 +3,7 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 b8516cb8edeaced8e04e851c89b62665 xorg-x11-6.8.0-files-0.2.tar.bz2 9816
-MD5 60090db4891f9d2a87f5279884463f3e xorg-x11-6.8.0-patches-0.2.tar.bz2 61625
+MD5 29823db60b4959aaebb87d1557394520 xorg-x11-6.8.0-patches-0.2.1.tar.bz2 61767
 MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
 MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
 MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index 3bc94575f43f..c613fdcca4c7 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.7 2004/09/22 00:22:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.8 2004/09/22 09:06:41 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -22,11 +22,12 @@ inherit eutils flag-o-matic gcc xfree
 RESTRICT="nostrip"
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc insecure-drivers ipv6 mmx nls pam sdk sse static xprint"
+IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc hardened
+	insecure-drivers ipv6 mmx nls pam sdk sse static xprint"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
-PATCH_VER="0.2"
+PATCH_VER="0.2.1"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
@@ -72,7 +73,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD FTL | GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-apps/baselayout-1.8.3
@@ -124,7 +125,15 @@ cflag_setup() {
 		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mtune -mips1 -mips2 -mips3 -mips4 -mabi" ;;
 		# -fomit-frame-pointer known to break things and is pointless
 		# according to ciaranm
-		sparc)	filter-flags "-fomit-frame-pointer" ;;
+		# And hardened compiler must be softened. -- fmccor, 20.viii.04
+		sparc)	filter-flags "-fomit-frame-pointer"
+			if use hardened
+			then
+				einfo "Softening gcc for sparc"
+				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
+				append-flags "-fno-pie -fno-PIE"
+			fi
+		;;
 		# gcc-3.3.2 causes invalid insn error
 		hppa ) replace-cpu-flags 1.0 2.0 ;;
 	esac
@@ -413,6 +422,22 @@ host_def_setup() {
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
+			if use hardened
+			then
+				einfo "Softening the assembler so cfb modules will play nice with sunffb"
+				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
+				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
+			fi
+			if ( [ -e "${ROOT}/usr/src/linux" ] && \
+			  !( `is_kernel "2" "6"` ) ) || \
+			  [ "`uname -r | cut -d. -f1,2`" != "2.6" ]
+			then
+				einfo "Building for kernels less than 2.6 requires special treatment"
+				echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
+				einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx"
+				echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \
+				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
+			fi
 		fi
 
 		# The definitions for fontconfig