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

Collapse All | Expand All

(-)/usr/portage/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild (-8 / +20 lines)
Lines 502-507 Link Here
502
	# Bulk patching - based on patch name
502
	# Bulk patching - based on patch name
503
	# Will create excluded stuff once it's needed
503
	# Will create excluded stuff once it's needed
504
	cd ${WORKDIR}
504
	cd ${WORKDIR}
505
506
	# As the patch sais, that breaks non-linux systems, more exaclty
507
	# it breaks non-glibc systems where open64 and loff_t doesn't exists.
508
	# Exclude this until a better workaround is in place.
509
	[[ "$LIBC" == "glibc" ]] || \
510
		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 0700_all_4.2.0-sessreg-highuid.patch"
511
505
	EPATCH_SUFFIX="patch" \
512
	EPATCH_SUFFIX="patch" \
506
	epatch ${PATCHDIR}
513
	epatch ${PATCHDIR}
507
	cd ${S}
514
	cd ${S}
Lines 524-529 Link Here
524
		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
531
		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
525
		#	>> ${HOSTCONF}
532
		#	>> ${HOSTCONF}
526
533
534
		if [[ "${KERNEL}" == "FreeBSD" ]]; then
535
			echo "#define __FreeBSD__" >> ${HOSTCONF}
536
			echo "#undef linux" >> ${HOSTCONF}
537
		fi
538
527
		# Enable i810 on x86_64 (RH #126687)
539
		# Enable i810 on x86_64 (RH #126687)
528
		if use amd64; then
540
		if use amd64; then
529
			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
541
			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
Lines 968-978 Link Here
968
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
980
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
969
			|| die "debug make World failed"
981
			|| die "debug make World failed"
970
	else
982
	else
971
		FAST=1 emake World WORLDOPTS="" || die "make World failed"
983
		FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"
972
	fi
984
	fi
973
985
974
	if use nls; then
986
	if use nls; then
975
		emake -C ${S}/nls || die "nls build failed"
987
		emake -C ${S}/nls MAKE="make" || die "nls build failed"
976
	fi
988
	fi
977
}
989
}
978
990
Lines 987-1015 Link Here
987
	# gcc3 related fix.  Do this during install, so that our
999
	# gcc3 related fix.  Do this during install, so that our
988
	# whole build will not be compiled without mmx instructions.
1000
	# whole build will not be compiled without mmx instructions.
989
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
1001
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
990
		make install DESTDIR=${D} \
1002
		make install MAKE="make" DESTDIR=${D} \
991
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
1003
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
992
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
1004
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
993
			install DESTDIR=${D} || die "install failed"
1005
			install MAKE="make" DESTDIR=${D} || die "install failed"
994
	else
1006
	else
995
		make install DESTDIR=${D} || die "install failed"
1007
		make install MAKE="make" DESTDIR=${D} || die "install failed"
996
	fi
1008
	fi
997
1009
998
	if use sdk; then
1010
	if use sdk; then
999
		einfo "Installing X.org X11 SDK..."
1011
		einfo "Installing X.org X11 SDK..."
1000
		make install.sdk DESTDIR=${D} || die "sdk install failed"
1012
		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
1001
	fi
1013
	fi
1002
1014
1003
	if ! use minimal; then
1015
	if ! use minimal; then
1004
		einfo "Installing man pages..."
1016
		einfo "Installing man pages..."
1005
		make install.man DESTDIR=${D} || die "man page install failed"
1017
		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
1006
		einfo "Compressing man pages..."
1018
		einfo "Compressing man pages..."
1007
		prepman /usr
1019
		prepman /usr
1008
	fi
1020
	fi
1009
1021
1010
	if use nls; then
1022
	if use nls; then
1011
		cd ${S}/nls
1023
		cd ${S}/nls
1012
		make DESTDIR=${D} install || die "nls install failed"
1024
		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
1013
	fi
1025
	fi
1014
	dodoc ${S}/RELNOTES
1026
	dodoc ${S}/RELNOTES
1015
}
1027
}

Return to bug 89852