[patch] Patch to convert 17.x.04 cvs xorg-x11-6.8.0-r2.ebuild into one which will build and run on sparc.

xorg-x11-6.8.0-r2-sparc.patch (text/plain), 1.67 KB, created by Ferris McCormick (RETIRED) on 2004-10-19 08:47:03 UTC

--- /homes/home0/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild	2004-10-18 05:46:02.000000000 +0000
+++ /usr/local/portage/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild	2004-10-18 20:24:58.000000000 +0000
@@ -74,7 +74,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"
+KEYWORDS="~x86 ~sparc"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-libs/ncurses-5.1
@@ -139,7 +139,7 @@
 		# according to ciaranm
 		# And hardened compiler must be softened. -- fmccor, 20.viii.04
 		sparc)	filter-flags "-fomit-frame-pointer"
-			if use hardened
+			if use hardened && ! use dlloader
 			then
 				einfo "Softening gcc for sparc"
 				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
@@ -341,6 +341,11 @@
 				then
 					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
 				fi
+				if use sparc
+				then
+					einfo "Zapping garbage sparc CFLAG"
+					echo "#define LargePositionIndependentCFlags -fPIC" >> ${HOSTCONF}
+				fi
 			fi
 		fi
 
@@ -451,7 +456,7 @@
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
-			if use hardened
+			if use hardened && ! use dlloader
 			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}
@@ -633,6 +638,14 @@
 	EPATCH_SUFFIX="patch" \
 	epatch ${PATCHDIR}
 	cd ${S}
+	if use sparc && use dlloader
+	then
+		cd ${S}/programs/Xserver
+		einfo "Apply hardened fix for afb and cfb"
+		epatch ${FILESDIR}/afb-cfb-dlloader-fixes.patch
+		cd ${S}
+	fi
+
 
 	host_def_setup