Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 63994 | Differences between
and this patch

Collapse All | Expand All

(-)xorg-x11-6.8.0.ebuild- (-3 / +37 lines)
Lines 22-28 Link Here
22
RESTRICT="nostrip"
22
RESTRICT="nostrip"
23
23
24
# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
24
# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
25
IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc insecure-drivers ipv6 mmx nls pam sdk sse static xprint"
25
IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc insecure-drivers ipv6
26
	mmx nls pam sdk sse static xprint hardened"
26
# IUSE_INPUT_DEVICES="synaptics wacom"
27
# IUSE_INPUT_DEVICES="synaptics wacom"
27
28
28
FILES_VER="0.1"
29
FILES_VER="0.1"
Lines 70-76 Link Here
70
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
71
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
71
	MIT SGI-B BSD FTL | GPL-2"
72
	MIT SGI-B BSD FTL | GPL-2"
72
SLOT="0"
73
SLOT="0"
73
KEYWORDS="~x86 ~amd64 ~ppc ~mips"
74
KEYWORDS="~x86 ~amd64 ~ppc ~mips ~sparc"
74
75
75
# Need portage-2.0.50_pre9 for `use !foo`
76
# Need portage-2.0.50_pre9 for `use !foo`
76
DEPEND=">=sys-apps/baselayout-1.8.3
77
DEPEND=">=sys-apps/baselayout-1.8.3
Lines 122-128 Link Here
122
		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;;
123
		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;;
123
		# -fomit-frame-pointer known to break things and is pointless
124
		# -fomit-frame-pointer known to break things and is pointless
124
		# according to ciaranm
125
		# according to ciaranm
125
		sparc)	filter-flags "-fomit-frame-pointer" ;;
126
		# And hardened compiler must be softened. -- fmccor, 20.viii.04
127
		sparc)	filter-flags "-fomit-frame-pointer"
128
			if use hardened 
129
			then
130
				einfo "Softening gcc for sparc"
131
				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
132
				append-flags "-fno-pie -fno-PIE" 
133
			fi
134
		;;
126
		# gcc-3.3.2 causes invalid insn error
135
		# gcc-3.3.2 causes invalid insn error
127
		hppa ) replace-cpu-flags 1.0 2.0 ;;
136
		hppa ) replace-cpu-flags 1.0 2.0 ;;
128
	esac
137
	esac
Lines 408-413 Link Here
408
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
417
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
409
			XF86OSCardDrivers XF86ExtraCardDrivers \
418
			XF86OSCardDrivers XF86ExtraCardDrivers \
410
			DevelDrivers" >> ${HOSTCONF}
419
			DevelDrivers" >> ${HOSTCONF}
420
			if use insecure-drivers
421
			then
422
				##
423
				# We are making a test bed playground, and we want to play with
424
				# ffb, mach64.  So...
425
				einfo "Forcing Dri drivers for (ffb, mach64)"
426
				echo "#define DriDrivers ffb mach64" >> ${HOSTCONF}
427
				echo "#define DevelDRIDrivers ffb mach64" >> ${HOSTCONF}
428
			fi
429
			if use hardened
430
			then
431
				einfo "Softening the assembler so cfb modules will play nice with sunffb"
432
				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
433
				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
434
			fi
435
			if ( [ -e "${ROOT}/usr/src/linux" ] && \
436
			  !( `is_kernel "2" "6"` ) ) || \
437
			  [ "`uname -r | cut -d. -f1,2`" != "2.6" ]
438
			then
439
				einfo "Building for kernel-$(uname -r) requires special treatment"
440
				echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
441
				einfo "Avoid bug 46593 for sparc32-SMP with kernel 2.4.xx"
442
				echo "/* Add a line to avoid bug 56593 on sparc32 */" >> \
443
				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
444
			fi
411
		fi
445
		fi
412
446
413
		# The definitions for fontconfig
447
		# The definitions for fontconfig

Return to bug 63994