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

Collapse All | Expand All

(-)/homes/home0/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild (-3 / +16 lines)
Lines 74-80 Link Here
74
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
74
	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
75
	MIT SGI-B BSD FTL GPL-2"
75
	MIT SGI-B BSD FTL GPL-2"
76
SLOT="0"
76
SLOT="0"
77
KEYWORDS="~x86"
77
KEYWORDS="~x86 ~sparc"
78
78
79
# Need portage-2.0.50_pre9 for `use !foo`
79
# Need portage-2.0.50_pre9 for `use !foo`
80
DEPEND=">=sys-libs/ncurses-5.1
80
DEPEND=">=sys-libs/ncurses-5.1
Lines 139-145 Link Here
139
		# according to ciaranm
139
		# according to ciaranm
140
		# And hardened compiler must be softened. -- fmccor, 20.viii.04
140
		# And hardened compiler must be softened. -- fmccor, 20.viii.04
141
		sparc)	filter-flags "-fomit-frame-pointer"
141
		sparc)	filter-flags "-fomit-frame-pointer"
142
			if use hardened
142
			if use hardened && ! use dlloader
143
			then
143
			then
144
				einfo "Softening gcc for sparc"
144
				einfo "Softening gcc for sparc"
145
				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
145
				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
Lines 341-346 Link Here
341
				then
341
				then
342
					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
342
					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
343
				fi
343
				fi
344
				if use sparc
345
				then
346
					einfo "Zapping garbage sparc CFLAG"
347
					echo "#define LargePositionIndependentCFlags -fPIC" >> ${HOSTCONF}
348
				fi
344
			fi
349
			fi
345
		fi
350
		fi
346
351
Lines 451-457 Link Here
451
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
456
			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
452
			XF86OSCardDrivers XF86ExtraCardDrivers \
457
			XF86OSCardDrivers XF86ExtraCardDrivers \
453
			DevelDrivers" >> ${HOSTCONF}
458
			DevelDrivers" >> ${HOSTCONF}
454
			if use hardened
459
			if use hardened && ! use dlloader
455
			then
460
			then
456
				einfo "Softening the assembler so cfb modules will play nice with sunffb"
461
				einfo "Softening the assembler so cfb modules will play nice with sunffb"
457
				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
462
				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
Lines 633-638 Link Here
633
	EPATCH_SUFFIX="patch" \
638
	EPATCH_SUFFIX="patch" \
634
	epatch ${PATCHDIR}
639
	epatch ${PATCHDIR}
635
	cd ${S}
640
	cd ${S}
641
	if use sparc && use dlloader
642
	then
643
		cd ${S}/programs/Xserver
644
		einfo "Apply hardened fix for afb and cfb"
645
		epatch ${FILESDIR}/afb-cfb-dlloader-fixes.patch
646
		cd ${S}
647
	fi
648
636
649
637
	host_def_setup
650
	host_def_setup
638
651

Return to bug 61063