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 (-9 / +24 lines)
Lines 524-529 Link Here
524
		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
524
		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
525
		#	>> ${HOSTCONF}
525
		#	>> ${HOSTCONF}
526
526
527
		if [[ "${KERNEL}" == "FreeBSD" ]]; then
528
			echo "#define __FreeBSD__" >> ${HOSTCONF}
529
			echo "#undef linux" >> ${HOSTCONF}
530
		fi
531
527
		# Enable i810 on x86_64 (RH #126687)
532
		# Enable i810 on x86_64 (RH #126687)
528
		if use amd64; then
533
		if use amd64; then
529
			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
534
			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
Lines 922-927 Link Here
922
		else
927
		else
923
			patch_exclude 5851
928
			patch_exclude 5851
924
		fi
929
		fi
930
931
		# Glibc-specific patches to exclude for non-glibc systems
932
		if [[ "${LIBC}" != "glibc" ]]; then
933
			patch_exclude 0700
934
		fi
935
936
		# Linux-specific patches to exclude for non-linux systems
937
		if [[ "${KERNEL}" != "linux" ]]; then
938
			patch_exclude 5900 5901
939
		fi
925
	einfo "Done excluding patches."
940
	einfo "Done excluding patches."
926
}
941
}
927
942
Lines 968-978 Link Here
968
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
983
		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
969
			|| die "debug make World failed"
984
			|| die "debug make World failed"
970
	else
985
	else
971
		FAST=1 emake World WORLDOPTS="" || die "make World failed"
986
		FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"
972
	fi
987
	fi
973
988
974
	if use nls; then
989
	if use nls; then
975
		emake -C ${S}/nls || die "nls build failed"
990
		emake -C ${S}/nls MAKE="make" || die "nls build failed"
976
	fi
991
	fi
977
}
992
}
978
993
Lines 987-1015 Link Here
987
	# gcc3 related fix.  Do this during install, so that our
1002
	# gcc3 related fix.  Do this during install, so that our
988
	# whole build will not be compiled without mmx instructions.
1003
	# whole build will not be compiled without mmx instructions.
989
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
1004
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
990
		make install DESTDIR=${D} \
1005
		make install MAKE="make" DESTDIR=${D} \
991
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
1006
		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
992
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
1007
			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
993
			install DESTDIR=${D} || die "install failed"
1008
			install MAKE="make" DESTDIR=${D} || die "install failed"
994
	else
1009
	else
995
		make install DESTDIR=${D} || die "install failed"
1010
		make install MAKE="make" DESTDIR=${D} || die "install failed"
996
	fi
1011
	fi
997
1012
998
	if use sdk; then
1013
	if use sdk; then
999
		einfo "Installing X.org X11 SDK..."
1014
		einfo "Installing X.org X11 SDK..."
1000
		make install.sdk DESTDIR=${D} || die "sdk install failed"
1015
		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
1001
	fi
1016
	fi
1002
1017
1003
	if ! use minimal; then
1018
	if ! use minimal; then
1004
		einfo "Installing man pages..."
1019
		einfo "Installing man pages..."
1005
		make install.man DESTDIR=${D} || die "man page install failed"
1020
		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
1006
		einfo "Compressing man pages..."
1021
		einfo "Compressing man pages..."
1007
		prepman /usr
1022
		prepman /usr
1008
	fi
1023
	fi
1009
1024
1010
	if use nls; then
1025
	if use nls; then
1011
		cd ${S}/nls
1026
		cd ${S}/nls
1012
		make DESTDIR=${D} install || die "nls install failed"
1027
		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
1013
	fi
1028
	fi
1014
	dodoc ${S}/RELNOTES
1029
	dodoc ${S}/RELNOTES
1015
}
1030
}
Lines 1949-1955 Link Here
1949
			mkdir -p ${x}
1964
			mkdir -p ${x}
1950
		fi
1965
		fi
1951
1966
1952
		chown root:root ${x}
1967
		chown root:wheel ${x}
1953
		chmod 1777 ${x}
1968
		chmod 1777 ${x}
1954
	done
1969
	done
1955
}
1970
}

Return to bug 89852