Gallium build broken on evbarm...

[Martin Husemann <martin%homeworld.netbsd.org@localhost>]

On Mon, Jan 06, 2020 at 01:37:57AM +0000, Greg Oster wrote:
> Module Name:	src
> Committed By:	oster
> Date:		Mon Jan  6 01:37:57 UTC 2020
> 
> Modified Files:
> 	src/sys/sys: sched.h
> 
> Log Message:
> Build fix.  Add back inclusion of <sys/queue.h>, which was previously
> included via <sys/evnct.h>.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.83 -r1.84 src/sys/sys/sched.h

Either this or the previous commit break the build - not sure how it got
lucky before:

#   compile  gallium/api_exec.pico
/work/tools/bin/arm--netbsdelf-eabi-gcc -O2 -pipe -std=gnu11 -pthread -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp   -std=gnu99   -Werror -Wno-error=stack-protector   -fPIE  -msoft-float  -fno-strict-aliasing   --sysroot=/work/hosts/evbarm -I/work/hosts/evbarm/usr/X11R7/include/libdrm  -I/work/src/external/apache2/llvm/dist/llvm/include  -I/work/src/external/apache2/llvm/include -I/work/src/external/apache2/llvm/config -DGALLIUM_SOFTPIPE  -DGALLIUM_STATIC_TARGETS=1  -DMESA_EGL_NO_X11_HEADERS -I/work/xsrc/external/mit/MesaLib/dist/include -I/work/xsrc/external/mit/MesaLib/dist/src -I/work/xsrc/external/mit/MesaLib/dist/src/mesa -I/work/xsrc/external/mit/MesaLib/dist/src/mapi -I/work/xsrc/external/mit/MesaLib/dist/src/gallium/include -I/work/xsrc/external/mit/MesaLib/dist/../src/mapi/glapi -I/work/xsrc/external/mit/MesaLib/dist/../src/mesa -I/work/xsrc/external/mit/MesaLib/dist/../src/mesa/main -I/work/xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common -DPACKAGE_NAME=\"Mesa\"  -DPACKAGE_TARNAME=\"mesa\"  -DPACKAGE_VERSION=\"19.1.17\"  -DPACKAGE_STRING=\"Mesa\ 19.1.17\"  -DVERSION=\"19.1.17\"  -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\";  -DPACKAGE_URL=\"\"  -DPACKAGE=\"mesa\" -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1  -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1  -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1  -DHAVE___BUILTIN_BSWAP32=1 -DHAVE___BUILTIN_BSWAP64=1  -DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CLZLL=1  -DHAVE___BUILTIN_CTZ=1 -DHAVE___BUILTIN_EXPECT=1  -DHAVE___BUILTIN_FFS=1 -DHAVE___BUILTIN_FFSLL=1  -DHAVE___BUILTIN_POPCOUNT=1 -DHAVE___BUILTIN_POPCOUNTLL=1  -DHAVE___BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1  -DHAVE_FUNC_ATTRIBUTE_FLATTEN=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1  -DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1  -DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL=1  -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 -DHAVE_FUNC_ATTRIBUTE_VISIBILITY=1  -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1  -DHAVE_FUNC_ATTRIBUTE_WEAK=1 -DHAVE_FUNC_ATTRIBUTE_ALIAS=1  -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_ENDIAN_H=1 -DHAVE_DLADDR=1  -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1  -DHAVE_PTHREAD=1  -D__STDC_CONSTANT_MACROS  -D__STDC_FORMAT_MACROS  -D__STDC_LIMIT_MACROS  -DUSE_GCC_ATOMIC_BUILTINS  -DNDEBUG  -DHAVE_SYS_SYSCTL_H  -DHAVE_DLFCN_H  -DHAVE_STRTOF  -DHAVE_MKOSTEMP  -DHAVE_TIMESPEC_GET  -DHAVE_STRTOD_L  -DHAVE_DL_ITERATE_PHDR  -DHAVE_POSIX_MEMALIGN  -DHAVE_ZLIB  -DHAVE_LIBDRM -DGLX_USE_DRM  -DGLX_INDIRECT_RENDERING  -DGLX_DIRECT_RENDERING  -DGLX_USE_TLS  -DHAVE_X11_PLATFORM  -DHAVE_DRM_PLATFORM  -DENABLE_SHADER_CACHE  -DHAVE_MINCORE  -DHAVE_LIBDRM -DGLX_USE_DRM -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DMESA_EGL_NO_X11_HEADERS -DYYTEXT_POINTER=1 -I/work/xsrc/external/mit/MesaLib/dist/src/compiler  -I/work/xsrc/external/mit/MesaLib/dist/../src/compiler  -I/work/xsrc/external/mit/MesaLib/dist/src/compiler/nir  -I/work/xsrc/external/mit/MesaLib/dist/../src/compiler/nir  -I/work/xsrc/external/mit/MesaLib/dist/src/compiler/glsl  -I/work/xsrc/external/mit/MesaLib/dist/../src/compiler/glsl  -I/work/xsrc/external/mit/MesaLib/dist/src/compiler/glsl/glcpp  -I/work/xsrc/external/mit/MesaLib/dist/../src/compiler/glsl/glcpp  -I/work/xsrc/external/mit/MesaLib/dist/src/compiler/spirv  -I/work/xsrc/external/mit/MesaLib/dist/src/gallium/include  -I/work/xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary  -I/work/xsrc/external/mit/MesaLib/dist/src/gallium/drivers  -I/work/xsrc/external/mit/MesaLib/dist/../src/mesa/drivers/dri/common  -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -I/work/hosts/evbarm/usr/X11R7/include -c   -I/work/xsrc/external/mit/MesaLib/dist/src/glsl -I/work/xsrc/external/mit/MesaLib/dist/src/mesa/main -I/work/xsrc/external/mit/MesaLib/dist/src/../../src/compiler/nir -fPIC   -g /work/xsrc/external/mit/MesaLib/dist/src/../../src/mapi/glapi/api_exec.c -o api_exec.pico
In file included from /work/xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir.h:34,
                 from /work/xsrc/external/mit/MesaLib/dist/src/mesa/main/glspirv.h:27,
                 from /work/xsrc/external/mit/MesaLib/dist/src/../../src/mapi/glapi/api_exec.c:68:
/work/xsrc/external/mit/MesaLib/dist/src/util/list.h:159: error: "LIST_REPLACE" redefined [-Werror]
 #define LIST_REPLACE(__from, __to) list_replace(__from, __to)
 
In file included from /work/hosts/evbarm/usr/include/sys/sched.h:74,
                 from /work/hosts/evbarm/usr/include/sched.h:37,
                 from /work/xsrc/external/mit/MesaLib/dist/include/c11/threads_posix.h:36,
                 from /work/xsrc/external/mit/MesaLib/dist/include/c11/threads.h:66,
                 from /work/xsrc/external/mit/MesaLib/dist/src/mesa/main/mtypes.h:39,
                 from /work/xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.h:39,
                 from /work/xsrc/external/mit/MesaLib/dist/src/mesa/main/context.h:54,
                 from /work/xsrc/external/mit/MesaLib/dist/src/mesa/main/blend.h:37,
                 from /work/xsrc/external/mit/MesaLib/dist/src/../../src/mapi/glapi/api_exec.c:40:
/work/hosts/evbarm/usr/include/sys/queue.h:296: note: this is the location of the previous definition
 #define LIST_REPLACE(elm, elm2, field) do {    \
 


We need better namespace protection here?

Martin