[patch] Replacement patch to the ebuild (better citizenship & provide for mach64 testing)

xorg-x11-6.8.0-sparc.patch (text/plain), 2.66 KB, created by Ferris McCormick (RETIRED) on 2004-09-15 09:50:13 UTC

--- xorg-x11-6.8.0.ebuild-	2004-09-13 11:06:31.000000000 +0000
+++ xorg-x11-6.8.0.ebuild	2004-09-15 13:24:26.245524000 +0000
@@ -22,7 +22,8 @@
 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 insecure-drivers ipv6
+	mmx nls pam sdk sse static xprint hardened"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.1"
@@ -70,7 +71,7 @@
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD FTL | GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~mips"
+KEYWORDS="~x86 ~amd64 ~ppc ~mips ~sparc"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-apps/baselayout-1.8.3
@@ -122,7 +123,15 @@
 		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -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
@@ -408,6 +417,31 @@
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
+			if use insecure-drivers
+			then
+				##
+				# We are making a test bed playground, and we want to play with
+				# ffb, mach64.  So...
+				einfo "Forcing Dri drivers for (ffb, mach64)"
+				echo "#define DriDrivers ffb mach64" >> ${HOSTCONF}
+				echo "#define DevelDRIDrivers ffb mach64" >> ${HOSTCONF}
+			fi
+			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 kernel-$(uname -r) 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