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

(-)/var/portage/cvs/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild (-9 / +14 lines)
Lines 929-934 Link Here
929
		else
929
		else
930
			patch_exclude 5851
930
			patch_exclude 5851
931
		fi
931
		fi
932
933
		# Glibc-specific patches to exclude for non-glibc systems
934
		if use elibc_FreeBSD || use elibc_OpenBSD; then
935
			patch_exclude 0700
936
		fi
932
	einfo "Done excluding patches."
937
	einfo "Done excluding patches."
933
}
938
}
934
939
Lines 975-985 Link Here
975
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
980
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
976
			|| die "debug make World failed"
981
			|| die "debug make World failed"
977
	else
982
	else
978
		FAST=1 emake World WORLDOPTS="" || die "make World failed"
983
		FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"
979
	fi
984
	fi
980
985
981
	if use nls; then
986
	if use nls; then
982
		emake -C ${S}/nls || die "nls build failed"
987
		emake -C ${S}/nls MAKE="make" || die "nls build failed"
983
	fi
988
	fi
984
}
989
}
985
990
Lines 994-1022 Link Here
994
	# gcc3 related fix.  Do this during install, so that our
999
	# gcc3 related fix.  Do this during install, so that our
995
	# whole build will not be compiled without mmx instructions.
1000
	# whole build will not be compiled without mmx instructions.
996
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
1001
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
997
		make install DESTDIR=${D} \
1002
		make install MAKE="make" DESTDIR=${D} \
998
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
1003
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
999
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
1004
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
1000
			install DESTDIR=${D} || die "install failed"
1005
			install MAKE="make" DESTDIR=${D} || die "install failed"
1001
	else
1006
	else
1002
		make install DESTDIR=${D} || die "install failed"
1007
		make install MAKE="make" DESTDIR=${D} || die "install failed"
1003
	fi
1008
	fi
1004
1009
1005
	if use sdk; then
1010
	if use sdk; then
1006
		einfo "Installing X.org X11 SDK..."
1011
		einfo "Installing X.org X11 SDK..."
1007
		make install.sdk DESTDIR=${D} || die "sdk install failed"
1012
		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
1008
	fi
1013
	fi
1009
1014
1010
	if ! use minimal; then
1015
	if ! use minimal; then
1011
		einfo "Installing man pages..."
1016
		einfo "Installing man pages..."
1012
		make install.man DESTDIR=${D} || die "man page install failed"
1017
		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
1013
		einfo "Compressing man pages..."
1018
		einfo "Compressing man pages..."
1014
		prepman /usr
1019
		prepman /usr
1015
	fi
1020
	fi
1016
1021
1017
	if use nls; then
1022
	if use nls; then
1018
		cd ${S}/nls
1023
		cd ${S}/nls
1019
		make DESTDIR=${D} install || die "nls install failed"
1024
		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
1020
	fi
1025
	fi
1021
	dodoc ${S}/RELNOTES
1026
	dodoc ${S}/RELNOTES
1022
}
1027
}
Lines 1956-1962 Link Here
1956
			mkdir -p ${x}
1961
			mkdir -p ${x}
1957
		fi
1962
		fi
1958
1963
1959
		chown root:root ${x}
1964
		chown root:wheel ${x}
1960
		chmod 1777 ${x}
1965
		chmod 1777 ${x}
1961
	done
1966
	done
1962
}
1967
}

Return to bug 89852