Errors compiling CUDA 8.0 samples with R27.1 on TX2

Several of the CUDA samples installed by Jetpack 3.0 fail to build with R27.1 on the Jetson TX2, including smokeParticles and nbody. Any idea what could be going wrong here?

nvidia@trixie:~/NVIDIA_CUDA-8.0_Samples/5_Simulations/smokeParticles$ make
/usr/local/cuda-8.0/bin/nvcc -ccbin g++ -I…/…/common/inc -m64 -gencode arch=compute_53,code=sm_53 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_62,code=sm_62 -gencode arch=compute_62,code=compute_62 -o GLSLProgram.o -c GLSLProgram.cpp
GLSLProgram.cpp: In member function ‘void GLSLProgram::bindTexture(const char*, GLuint, GLenum, GLint)’:
GLSLProgram.cpp:173:9: error: reference to ‘glActiveTexture’ is ambiguous
glActiveTexture(GL_TEXTURE0 + unit);
^
In file included from …/…/common/inc/helper_gl.h:23:0,
from GLSLProgram.cpp:14:
/usr/include/GL/gl.h:1823:23: note: candidates are: void glActiveTexture(GLenum)
GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
^
In file included from GLSLProgram.cpp:14:0:
…/…/common/inc/helper_gl.h:106:17: note: void (* __HelperGL::glActiveTexture)(GLenum)
USE_GL_FUNC(glActiveTexture, PFNGLACTIVETEXTUREPROC);
^
…/…/common/inc/helper_gl.h:47:51: note: in definition of macro ‘USE_GL_FUNC’
#define USE_GL_FUNC(name, proto) extern proto name
^
GLSLProgram.cpp:177:9: error: reference to ‘glActiveTexture’ is ambiguous
glActiveTexture(GL_TEXTURE0);
^
In file included from …/…/common/inc/helper_gl.h:23:0,
from GLSLProgram.cpp:14:
/usr/include/GL/gl.h:1823:23: note: candidates are: void glActiveTexture(GLenum)
GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
^
In file included from GLSLProgram.cpp:14:0:
…/…/common/inc/helper_gl.h:106:17: note: void (* __HelperGL::glActiveTexture)(GLenum)
USE_GL_FUNC(glActiveTexture, PFNGLACTIVETEXTUREPROC);
^
…/…/common/inc/helper_gl.h:47:51: note: in definition of macro ‘USE_GL_FUNC’
#define USE_GL_FUNC(name, proto) extern proto name
^
Makefile:268: recipe for target ‘GLSLProgram.o’ failed
make: *** [GLSLProgram.o] Error 1
nvidia@trixie:~/NVIDIA_CUDA-8.0_Samples/5_Simulations/smokeParticles$

You may try to change file: …/…/common/inc/helper_gl.h

line105: --- #if !defined(GLX_EXTENSION_NAME) || defined(__arm__) || defined(__aarch64__)
line105: +++ #if !defined(GLX_EXTENSION_NAME) || !defined(GL_VERSION_1_3)

That did the trick. Thanks! Now both smokeParticles and nbody build and run correctly.

Any advice on how to compile Ocean? Now the ocean seems to compile too.
Thank you for sharing the patch!