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-r1.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.2"
29
FILES_VER="0.2"
Lines 72-78 Link Here
72
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
73
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
73
	MIT SGI-B BSD FTL | GPL-2"
74
	MIT SGI-B BSD FTL | GPL-2"
74
SLOT="0"
75
SLOT="0"
75
KEYWORDS="~x86 ~ppc ~mips ~alpha"
76
KEYWORDS="~x86 ~amd64 ~ppc ~mips ~sparc"
76
77
77
# Need portage-2.0.50_pre9 for `use !foo`
78
# Need portage-2.0.50_pre9 for `use !foo`
78
DEPEND=">=sys-apps/baselayout-1.8.3
79
DEPEND=">=sys-apps/baselayout-1.8.3
Lines 124-130 Link Here
124
		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mtune -mips1 -mips2 -mips3 -mips4 -mabi" ;;
125
		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mtune -mips1 -mips2 -mips3 -mips4 -mabi" ;;
125
		# -fomit-frame-pointer known to break things and is pointless
126
		# -fomit-frame-pointer known to break things and is pointless
126
		# according to ciaranm
127
		# according to ciaranm
127
		sparc)	filter-flags "-fomit-frame-pointer" ;;
128
		# And hardened compiler must be softened. -- fmccor, 20.viii.04
129
		sparc)	filter-flags "-fomit-frame-pointer"
130
			if use hardened 
131
			then
132
				einfo "Softening gcc for sparc"
133
				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
134
				append-flags "-fno-pie -fno-PIE" 
135
			fi
136
		;;
128
		# gcc-3.3.2 causes invalid insn error
137
		# gcc-3.3.2 causes invalid insn error
129
		hppa ) replace-cpu-flags 1.0 2.0 ;;
138
		hppa ) replace-cpu-flags 1.0 2.0 ;;
130
	esac
139
	esac
Lines 410-415 Link Here
410
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
419
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
411
			XF86OSCardDrivers XF86ExtraCardDrivers \
420
			XF86OSCardDrivers XF86ExtraCardDrivers \
412
			DevelDrivers" >> ${HOSTCONF}
421
			DevelDrivers" >> ${HOSTCONF}
422
			if use insecure-drivers
423
			then
424
				##
425
				# We are making a test bed playground, and we want to play with
426
				# ffb, mach64.  So...
427
				einfo "Forcing Dri drivers for (ffb, mach64)"
428
				echo "#define DriDrivers ffb mach64" >> ${HOSTCONF}
429
				echo "#define DevelDRIDrivers ffb mach64" >> ${HOSTCONF}
430
			fi
431
			if use hardened
432
			then
433
				einfo "Softening the assembler so cfb modules will play nice with sunffb"
434
				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
435
				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
436
			fi
437
			if ( [ -e "${ROOT}/usr/src/linux" ] && \
438
			  !( `is_kernel "2" "6"` ) ) || \
439
			  [ "`uname -r | cut -d. -f1,2`" != "2.6" ]
440
			then
441
				einfo "Building for kernel-$(uname -r) requires special treatment"
442
				echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
443
				einfo "Avoid bug 46593 for sparc32-SMP with kernel 2.4.xx"
444
				echo "/* Add a line to avoid bug 56593 on sparc32 */" >> \
445
				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
446
			fi
413
		fi
447
		fi
414
448
415
		# The definitions for fontconfig
449
		# The definitions for fontconfig

Return to bug 63994