Permalink
Browse files

ENH: add CUDA 4.2 related stuff

  • Loading branch information...
npinto committed Apr 24, 2012
1 parent e521d28 commit ff84626466b19254f94dc58ee78147b72564149e
Showing with 1,388 additions and 0 deletions.
  1. +2 −0 dev-util/nvidia-cuda-sdk/Manifest
  2. +92 −0 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
  3. +2 −0 dev-util/nvidia-cuda-tdk/Manifest
  4. +71 −0 dev-util/nvidia-cuda-tdk/nvidia-cuda-tdk-2.295.1.ebuild
  5. +3 −0 dev-util/nvidia-cuda-toolkit/Manifest
  6. +110 −0 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
  7. +20 −0 x11-drivers/nvidia-drivers/Manifest
  8. +2 −0 x11-drivers/nvidia-drivers/files/09nvidia
  9. +30 −0 x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
  10. +31 −0 x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
  11. +11 −0 x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
  12. +13 −0 x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
  13. +21 −0 x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
  14. +19 −0 x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
  15. +116 −0 x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
  16. +33 −0 x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
  17. +32 −0 x11-drivers/nvidia-drivers/files/libGL.la-r2
  18. +40 −0 x11-drivers/nvidia-drivers/files/nvidia
  19. +14 −0 x11-drivers/nvidia-drivers/files/nvidia-169.07
  20. +14 −0 x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
  21. +92 −0 x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
  22. +14 −0 x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
  23. +17 −0 x11-drivers/nvidia-drivers/files/nvidia-udev.sh
  24. +6 −0 x11-drivers/nvidia-drivers/files/nvidia.udev-rule
  25. +583 −0 x11-drivers/nvidia-drivers/nvidia-drivers-295.41.ebuild
@@ -0,0 +1,2 @@
+DIST gpucomputingsdk_4.2.9_linux.run 152436489 RMD160 7b0cbe3565d0abbb29bdd3d1f5fe49c273d46f4f SHA1 ba39a23a43dca4a64f07c7bfe574e9c3398abd83 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb
+EBUILD nvidia-cuda-sdk-4.2.ebuild 1833 RMD160 02759e6f9f7d5fef30bf178542f2efa6d63dd3e1 SHA1 3f833dc87580815a8cde690401448741511ef656 SHA256 7a71c0286fc1b4a143f1995e36560f839277d9273b5bb2bb6a8d37da79c28c7d
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/sdk/gpucomputingsdk_${CUDA_V}.9_linux.run"
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +doc +examples opencl +cuda"
+
+RDEPEND=">=dev-util/nvidia-cuda-toolkit-4.2
+ examples? ( >=x11-drivers/nvidia-drivers-295.40 )
+ media-libs/freeglut"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="binchecks"
+
+pkg_setup() {
+ if use cuda || use opencl && [ $(gcc-major-version) -lt 4 -o $(gcc-minor-version) -lt 5 ]; then
+ eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully."
+ eerror "Please use gcc-config to switch to a compatible GCC version."
+ die ">=sys-devel/gcc-4.4 required"
+ fi
+ echo $(gcc-major-version) $(gcc-minor-version)
+}
+
+src_compile() {
+ if ! use examples; then
+ return
+ fi
+ local myopts=""
+
+ if use debug; then
+ myopts="${myopts} dbg=1"
+ fi
+
+ cd "${S}/sdk"
+
+ if use cuda; then
+ cd C
+ emake cuda-install=/opt/cuda ${myopts} || die
+ cd ..
+ fi
+
+ if use opencl; then
+ cd OpenCL
+ emake || die
+ cd ..
+ fi
+}
+
+src_install() {
+ cd "${S}/sdk"
+
+ if ! use doc; then
+ rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
+ fi
+
+ if ! use examples; then
+ rm -rf bin */bin */tools
+ fi
+
+ for f in $(find .); do
+ local t="$(dirname ${f})"
+ if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
+ continue
+ fi
+
+ if [[ ! -d "${f}" ]]; then
+ if [[ -x "${f}" ]]; then
+ exeinto "/opt/cuda/sdk/${t}"
+ doexe "${f}"
+ else
+ insinto "/opt/cuda/sdk/${t}"
+ doins "${f}"
+ fi
+ fi
+ done
+}
@@ -1,2 +1,4 @@
DIST tdk_1.285.1.linux_tar.gz 1426343 RMD160 4464ffe1a4379e4332e5d148d06364e8da7b6fa5 SHA1 60fc50aa64efd30567c13bdf6ec2b5ec2bb8d2e3 SHA256 3190d23db055e22de7651cdf14dc1c7f8c6c02d3281e1541062159f597e86457
+DIST tdk_2.295.1_linux.tar.gz 1194352 RMD160 4d801c0470cb0a179068748b51b38ac70f999595 SHA1 aace711fadecc64aee3f52b2e2695de6f5715d86 SHA256 2874d6f221ac34deffc35f337032885a6f059f3cbc1daab57af895d6e9ec4a8d
EBUILD nvidia-cuda-tdk-1.285.1.ebuild 1230 RMD160 38b4dca6010080f09d2632ab58906bc9c9fb0487 SHA1 b6500cef326bcfca6db22edae990a89d7567b878 SHA256 32130b11dfa1480d0f4804ac7703fbbdca3aa6c6465def01c9b2907b4e64adf2
+EBUILD nvidia-cuda-tdk-2.295.1.ebuild 1219 RMD160 a116a36892a783e677db7741d3c136fcda33a57d SHA1 8f3fbdb4e9840282bee94883e9013f89b335c9cf SHA256 97d2e247b9a3d8d2c6d068c6e8eb8232d61c94e4fd72b2e664bb4c271f56cafa
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="NVIDIA Tesla Deployment Kit"
+HOMEPAGE="http://developer.nvidia.com/tesla-deployment-kit"
+
+SRC_URI=http://developer.download.nvidia.com/assets/cuda/files/CUDADownloads/NVML/tdk_${PV}_linux.tar.gz
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+doc +examples"
+
+RDEPEND="
+>=dev-util/nvidia-cuda-toolkit-4.1
+examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
+media-libs/freeglut
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="binchecks"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ tar xvf ${A%.*}
+}
+
+src_compile() {
+ cd "${S}/tdk_${PV}/"
+
+ if use examples; then
+ cd example
+ emake || die
+ fi
+}
+
+src_install() {
+ cd "${S}/tdk_${PV}/"
+
+ if ! use doc; then
+ rm -rf *.txt doc
+ fi
+
+ if ! use examples; then
+ rm -rf example
+ fi
+
+ for f in $(find .); do
+ local t="$(dirname ${f})"
+ if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
+ continue
+ fi
+
+ if [[ ! -d "${f}" ]]; then
+ if [[ -x "${f}" ]]; then
+ exeinto "/opt/cuda/tdk/${t}"
+ doexe "${f}"
+ else
+ insinto "/opt/cuda/tdk/${t}"
+ doins "${f}"
+ fi
+ fi
+ done
+}
@@ -0,0 +1,3 @@
+DIST cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 RMD160 459e0eb9bad6b96dbbf07508bcd51e6fb8a2662c SHA1 f570837a0b98a5c1d440d11053a48649887fd5c9 SHA256 0c91d51e49c7cabc13fafa75cbf547c6902557cb5c3e19b4cf3c83c26172a03f
+DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 RMD160 cac409facac941c510d486b1b654b4003281e840 SHA1 1d7404e69affb487f9c6a0f2ea904d72f3a0f7e5 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38
+EBUILD nvidia-cuda-toolkit-4.2.ebuild 2539 RMD160 b1ca2fcdfb3de0f0bfdb5a8bc7f034edd4bb072f SHA1 b70d349c5788ad2ec433c24f971481c464657c00 SHA256 047d1aae07f3633385b07c12d68d1df76a04a68f969dda25bfd39f4334a1ece1
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils multilib unpacker
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+RESTRICT="binchecks"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
+ x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_32_ubuntu11.04.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+RDEPEND="${DEPEND}
+ >=sys-devel/binutils-2.20
+ >=sys-devel/gcc-4.5
+ debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
+ >=x11-drivers/nvidia-drivers-295.40"
+
+S="${WORKDIR}"
+
+src_install() {
+ local DEST=/opt/cuda
+
+ into ${DEST}
+ dobin bin/*
+ dobin nvvm/*
+ dolib $(get_libdir)/*
+
+ if ! use debugger; then
+ rm -f "${D}/${DEST}/bin/cuda-gdb"
+ else
+ insinto ${DEST}/extras
+ doins -r extras/Debugger
+ fi
+
+ if use profiler; then
+ # TODO: Use system JRE for the profiler?
+ insinto ${DEST}
+ doins -r libnvvp
+ fperms a+x ${DEST}/libnvvp/nvvp ${DEST}/libnvvp/jre/bin/* ${DEST}/libnvvp/*.so
+
+ cat > "${T}/nvv" << EOF
+#!/bin/sh
+LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${DEST}/lib:${DEST}/lib64 ${DEST}/libnvvp/nvvp
+EOF
+ dobin "${T}/nvv"
+ insinto ${DEST}/extras
+ doins -r extras/CUPTI
+ fi
+
+ chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+ chmod a-x "${D}/${DEST}/bin/ci_include.h"
+
+ # TODO: Manuals are missing from this release. Remove the following
+ # commented-out lines if they are not restored in the next releases.
+ # doman does not respect DESTTREE
+ #insinto ${DEST}/man/man1
+ #doins man/man1/*
+ #insinto ${DEST}/man/man3
+ #doins man/man3/*
+ #prepman ${DEST}
+
+ insinto ${DEST}/include
+ doins -r include/*
+
+ insinto ${DEST}/src
+ doins src/*
+
+ if use doc ; then
+ insinto ${DEST}/doc
+ doins -r doc/*
+ fi
+
+ cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/$(get_libdir)
+MANPATH=${DEST}/man
+EOF
+ newenvd "${T}/env" 99cuda
+
+ export CONF_LIBDIR_OVERRIDE="lib"
+ # HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+ export LIBDIR_amd64="lib"
+
+ into ${DEST}/open64
+ dobin open64/bin/*
+ libopts -m0755
+ dolib open64/lib/*
+}
+
+pkg_postinst() {
+ elog "If you want to natively run the code generated by this version of the"
+ elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-295.40"
+ elog ""
+ elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}
@@ -0,0 +1,20 @@
+AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
+AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
+AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
+AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
+AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
+AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672
+AUX eblits/mtrr_check.eblit 629 RMD160 a7f9090f419faa17e74b81346c4bb019a7700138 SHA1 edb9ba38de929a9a0406408701a454f514fe78ed SHA256 ae1b8fb37985fc3e42a4a776779b3fe3d70be2c826df5c3f99d03ba7209ca0b1
+AUX eblits/src_install-libs.eblit 3472 RMD160 3e00b70ea45c7fdf6ec6a48c121f56b8faae15da SHA1 ec4cb37556284846a24fcdd54cff1a4cd0ccc539 SHA256 6f301de374736cec316794bf1935a15de025b3c505981f24e06e3df75818ad6a
+AUX eblits/want_tls.eblit 952 RMD160 4f33e6aef50032665d68654af1cfdbd9abc54195 SHA1 cf96ae8227913439526f0ab2ec984e5be6f3a1fd SHA256 e5ce767a2e9a5c0682e764b9ba42a20e721a093f4c0626605570c8b5e3afecd0
+AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b
+AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5
+AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577
+AUX nvidia-drivers-173.14.30-2.6.39.patch 599 RMD160 9dd06b0036a2ceed8b5a4874b584d32ac25c17f5 SHA1 d5dcbc8edfb05b79ea1f73068b87cd9068f8cf06 SHA256 f1528152fb786d74701bd5d99ccbabad0b1ac791958d83c17bf783484dda9474
+AUX nvidia-drivers-190.53-2.6.33.patch 2893 RMD160 29f6cf29909828f8d22504dfcb43b23aeeff78dd SHA1 412f8a2b208e8af886891985fcabf8623c9943c3 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f
+AUX nvidia-drivers-260.19.44-2.6.39.patch 591 RMD160 8e53d800b86c380da9e9c978957a4d1b7f749fe4 SHA1 39be99b92fb16a71347fb8fb39301241550a1958 SHA256 dc9478bb4ff12d820f82bb13a8d7f956456ea97217ba89e6619f1c8d72127be3
+AUX nvidia-udev.sh 185 RMD160 26d8e7e1447daa7d4fd09993f855b58ae1754a72 SHA1 d607b57662e0542b335cbc86ed3c946bb522891f SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e
+AUX nvidia.udev-rule 462 RMD160 a7bc1d61d75a7fd7847903064ae5974e4079db5a SHA1 ac04cf8838bab05d5c092446d34c0154b9f6220e SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6
+DIST devdriver_4.2_linux_32_295.41.run 34671088 RMD160 71ec289b23a06a0d008914228e57ce2091fbc32c SHA1 ce06753c891c3b43e66620503c118e8b17acb63b SHA256 935c77b0879ae1d9b8629bba4f7f8a4d2678d7ef558fbc837ff55b70bee8236c
+DIST devdriver_4.2_linux_64_295.41.run 58449059 RMD160 e99fcc35f5a4875ad7f1e2f9c1fce719116b82bf SHA1 518804a9c110d07aebb5559806e307e064cbf924 SHA256 fcdbe5fc9d2f3bc28956a23e5e9a7e3dc8b41901c4c2c1b4d0c3efedcd862fa3
+EBUILD nvidia-drivers-295.41.ebuild 18170 RMD160 18557ff5d18660f7ef0066edc04daedd3e7db7f9 SHA1 bc056640e3e92b344fd1f0c108e815b4494ca7f2 SHA256 60fde7805ec472e1b88a7d80f55bb0a9f1f490415f56b3ab9739cb9b89ea7e6b
@@ -0,0 +1,2 @@
+# Has to precede X11's own libraries!
+LDPATH=/opt/nvidia/lib
@@ -0,0 +1,30 @@
+diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh
+--- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100
++++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100
+@@ -82,7 +82,7 @@ build_cflags() {
+
+ if [ "$OUTPUT" != "$SOURCES" ]; then
+ MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -91,7 +91,7 @@ build_cflags() {
+ fi
+ else
+ MACH_CFLAGS="-I$HEADERS/asm/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -102,7 +102,7 @@ build_cflags() {
+
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
+
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ fi
+ if [ -n "$BUILD_PARAMS" ]; then
@@ -0,0 +1,31 @@
+Add support for the 'x86' unified kernel arch in conftest.sh
+
+--- NVIDIA-Linux-x86-256.25/kernel/conftest.sh
++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh
+@@ -101,7 +101,7 @@ build_cflags() {
+
+ if [ "$OUTPUT" != "$SOURCES" ]; then
+ MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -110,7 +110,7 @@ build_cflags() {
+ fi
+ else
+ MACH_CFLAGS="-I$HEADERS/asm/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -121,7 +121,7 @@ build_cflags() {
+
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ fi
+ if [ -n "$BUILD_PARAMS" ]; then
@@ -0,0 +1,11 @@
+diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100
+@@ -39,6 +39,7 @@
+ typedef XID GLXPixmap;
+ typedef XID GLXDrawable;
+ typedef XID GLXPbuffer;
++typedef XID GLXPbufferSGIX;
+ typedef XID GLXWindow;
+ typedef XID GLXFBConfigID;
+
Oops, something went wrong.

0 comments on commit ff84626

Please sign in to comment.