On June 1, 2024 1:35:29 AM PDT, Nuno Teixeira <edua...@freebsd.org> wrote: >(...) > >commit 108de784513d87bbe850e7b003a73e26b5b54caa >Author: Val Packett <v...@packett.cool> >Date: Fri May 31 08:45:02 2024 -0600 > > Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME > >Nuno Teixeira <edua...@freebsd.org> escreveu (sábado, 1/06/2024 à(s) 09:01): > >> Hello all, >> >> Anyone seeing this error on main? >> >> Thanks >> >> [ 28% 661/2246] cc -Isrc/intel/common/libintel_common.a.p >> -Isrc/intel/common -I../src/intel/common -Iinclude -I../include -Isrc >> -I../src -Isrc/intel -I../src/intel -Isrc/intel/genxml -Isrc/intel/dev >> -I/usr/local/ >> include -I/usr/local/include/libdrm -fvisibility=hidden >> -fdiagnostics-color=never -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall >> -Winvalid-pch -std=c11 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS >> -D__STDC_LIMIT_MACROS >> '-DPACKAGE_VERSION="24.0.8"' '-DPACKAGE_BUGREPORT=" >> https://gitlab.freedesktop.org/mesa/mesa/-/issues";' -DHAVE_OPENGL=1 >> -DHAVE_OPENGL_ES_1=1 -DHAVE_OPENGL_ES_2=1 -DHAVE_SWRAST -DHAVE_ZINK >> -DHAVE_R300 -DHAVE_R600 >> -DHAVE_RADEONSI -DHAVE_CROCUS -DHAVE_I915 -DHAVE_IRIS -DHAVE_SVGA >> -DUSE_VK_COMPILER=1 -DVIDEO_CODEC_VC1DEC=1 -DVIDEO_CODEC_H264DEC=1 >> -DVIDEO_CODEC_H264ENC=1 -DVIDEO_CODEC_H265DEC=1 -DVIDEO_CODEC_H265ENC=1 >> -DVIDEO >> _CODEC_AV1DEC=1 -DVIDEO_CODEC_AV1ENC=1 -DVIDEO_CODEC_VP9DEC=1 >> -DHAVE_X11_PLATFORM -DHAVE_WAYLAND_PLATFORM -DHAVE_SURFACELESS_PLATFORM >> -DHAVE_DRM_PLATFORM -DHAVE_XCB_PLATFORM -DENABLE_ST_OMX_BELLAGIO=0 >> -DENABLE_ST >> _OMX_TIZONIA=0 -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING >> -DGLX_USE_DRM -DGLAPI_EXPORT_PROTO_ENTRY_POINTS=0 -DALLOW_KCMP >> -DETIME=ETIMEDOUT -DENABLE_SHADER_CACHE -DHAVE___BUILTIN_BSWAP32 >> -DHAVE___BUILTIN_BSWA >> P64 -DHAVE___BUILTIN_CLZ -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ >> -DHAVE___BUILTIN_EXPECT -DHAVE___BUILTIN_FFS -DHAVE___BUILTIN_FFSLL >> -DHAVE___BUILTIN_POPCOUNT -DHAVE___BUILTIN_POPCOUNTLL -DHAVE___BUILTIN_UNRE >> ACHABLE -DHAVE___BUILTIN_TYPES_COMPATIBLE_P -DHAVE_FUNC_ATTRIBUTE_CONST >> -DHAVE_FUNC_ATTRIBUTE_FLATTEN -DHAVE_FUNC_ATTRIBUTE_MALLOC >> -DHAVE_FUNC_ATTRIBUTE_PURE -DHAVE_FUNC_ATTRIBUTE_UNUSED >> -DHAVE_FUNC_ATTRIBUTE_WAR >> N_UNUSED_RESULT -DHAVE_FUNC_ATTRIBUTE_WEAK -DHAVE_FUNC_ATTRIBUTE_FORMAT >> -DHAVE_FUNC_ATTRIBUTE_PACKED -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL >> -DHAVE_FUNC_ATTRIBUTE_ALIAS -DHAVE_FUNC_ATTRIBUTE_NORETURN -DHAVE_FUNC_AT >> TRIBUTE_VISIBILITY -DHAVE_UINT128 -DHAVE_REALLOCARRAY -DHAVE_FMEMOPEN >> -D_GNU_SOURCE -DUSE_SSE41 -DHAVE___BUILTIN_IA32_CLFLUSHOPT >> -DUSE_GCC_ATOMIC_BUILTINS -DUSE_X86_64_ASM -DHAS_SCHED_H >> -DHAS_SCHED_GETAFFINITY -D >> HAVE_SYS_SYSCTL_H -DHAVE_XLOCALE_H -DHAVE_ENDIAN_H -DHAVE_DLFCN_H >> -DHAVE_SYS_SHM_H -DHAVE_CET_H -DHAVE_PTHREAD_NP_H -DHAVE_STRTOF >> -DHAVE_MKOSTEMP -DHAVE_MEMFD_CREATE -DHAVE_FLOCK -DHAVE_STRTOK_R >> -DHAVE_GETRANDOM >> -DHAVE_QSORT_S -DHAVE_POSIX_FALLOCATE -DHAVE_SECURE_GETENV >> -DHAVE_GNU_QSORT_R -DHAVE_STRUCT_TIMESPEC -DHAVE_POSIX_MEMALIGN >> -DHAVE_DIRENT_D_TYPE -DHAVE_STRTOD_L -DHAVE_DLADDR -DHAVE_DL_ITERATE_PHDR >> -DSUPPORT_INTEL >> _INTEGRATED_GPUS -DHAVE_ZLIB -DHAVE_ZSTD -DHAVE_COMPRESSION -DHAVE_PTHREAD >> -DHAVE_LIBDRM '-DMESA_LLVM_VERSION_STRING="15.0.7"' -DLLVM_IS_SHARED=1 >> -DLLVM_AVAILABLE=1 -DDRAW_LLVM_AVAILABLE=1 -DUSE_LIBELF -DWL_HIDE_ >> DEPRECATED -DHAVE_DRI -DHAVE_DRI2 -DHAVE_DRI3 -DHAVE_DRI3_MODIFIERS >> -DHAVE_DRISW_KMS -Werror=implicit-function-declaration >> -Werror=missing-prototypes -Werror=return-type -Werror=empty-body >> -Werror=incompatible-po >> inter-types -Werror=int-conversion -Wimplicit-fallthrough >> -Wmisleading-indentation -Wno-missing-field-initializers >> -Wno-format-truncation -fno-math-errno -fno-trapping-math >> -Qunused-arguments -fno-common -Wno-unk >> nown-pragmas -Wno-microsoft-enum-value -Wno-unused-function -Werror=format >> -Wformat-security -ffunction-sections -fdata-sections -Wno-unused-variable >> -Wno-unused-but-set-variable -O2 -pipe -fstack-protector-stron >> g -fno-strict-aliasing -fPIC -pthread -Wno-override-init >> -Wno-initializer-overrides -MD -MQ >> src/intel/common/libintel_common.a.p/xe_intel_gem.c.o -MF >> src/intel/common/libintel_common.a.p/xe_intel_gem.c.o.d -o src >> /intel/common/libintel_common.a.p/xe_intel_gem.c.o -c >> ../src/intel/common/xe/intel_gem.c >> FAILED: src/intel/common/libintel_common.a.p/xe_intel_gem.c.o >> cc -Isrc/intel/common/libintel_common.a.p -Isrc/intel/common >> -I../src/intel/common -Iinclude -I../include -Isrc -I../src -Isrc/intel >> -I../src/intel -Isrc/intel/genxml -Isrc/intel/dev -I/usr/local/include >> -I/usr/l >> ocal/include/libdrm -fvisibility=hidden -fdiagnostics-color=never -DNDEBUG >> -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 >> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS >> '-DPACKAGE_VERS >> ION="24.0.8"' '-DPACKAGE_BUGREPORT=" >> https://gitlab.freedesktop.org/mesa/mesa/-/issues";' -DHAVE_OPENGL=1 >> -DHAVE_OPENGL_ES_1=1 -DHAVE_OPENGL_ES_2=1 -DHAVE_SWRAST -DHAVE_ZINK >> -DHAVE_R300 -DHAVE_R600 -DHAVE_RADEONSI >> -DHAVE_CROCUS -DHAVE_I915 -DHAVE_IRIS -DHAVE_SVGA -DUSE_VK_COMPILER=1 >> -DVIDEO_CODEC_VC1DEC=1 -DVIDEO_CODEC_H264DEC=1 -DVIDEO_CODEC_H264ENC=1 >> -DVIDEO_CODEC_H265DEC=1 -DVIDEO_CODEC_H265ENC=1 -DVIDEO_CODEC_AV1DEC=1 >> -DVIDEO_CODEC_AV1ENC=1 -DVIDEO_CODEC_VP9DEC=1 -DHAVE_X11_PLATFORM >> -DHAVE_WAYLAND_PLATFORM -DHAVE_SURFACELESS_PLATFORM -DHAVE_DRM_PLATFORM >> -DHAVE_XCB_PLATFORM -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 >> -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_DRM >> -DGLAPI_EXPORT_PROTO_ENTRY_POINTS=0 -DALLOW_KCMP -DETIME=ETIMEDOUT >> -DENABLE_SHADER_CACHE -DHAVE___BUILTIN_BSWAP32 -DHAVE___BUILTIN_BSWAP64 >> -DHAVE___BUILTIN_CLZ -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ >> -DHAVE___BUILTIN_EXPECT -DHAVE___BUILTIN_FFS -DHAVE___BUILTIN_FFSLL >> -DHAVE___BUILTIN_POPCOUNT -DHAVE___BUILTIN_POPCOUNTLL >> -DHAVE___BUILTIN_UNREACHABLE -DHAVE___BUILTIN_TYPES_COMPATIBLE_P >> -DHAVE_FUNC_ATTRIBUTE_CONST -DHAVE_FUNC_ATTRIBUTE_FLATTEN >> -DHAVE_FUNC_ATTRIBUTE_MALLOC -DHAVE_FUNC_ATTRIBUTE_PURE >> -DHAVE_FUNC_ATTRIBUTE_UNUSED -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT >> -DHAVE_FUNC_ATTRIBUTE_WEAK -DHAVE_FUNC_ATTRIBUTE_FORMAT >> -DHAVE_FUNC_ATTRIBUTE_PACKED -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL >> -DHAVE_FUNC_ATTRIBUTE_ALIAS -DHAVE_FUNC_ATTRIBUTE_NORETURN >> -DHAVE_FUNC_ATTRIBUTE_VISIBILITY -DHAVE_UINT128 -DHAVE_REALLOCARRAY >> -DHAVE_FMEMOPEN -D_GNU_SOURCE -DUSE_SSE41 -DHAVE___BUILTIN_IA32_CLFLUSHOPT >> -DUSE_GCC_ATOMIC_BUILTINS -DUSE_X86_64_ASM -DHAS_SCHED_H >> -DHAS_SCHED_GETAFFINITY -DHAVE_SYS_SYSCTL_H -DHAVE_XLOCALE_H >> -DHAVE_ENDIAN_H -DHAVE_DLFCN_H -DHAVE_SYS_SHM_H -DHAVE_CET_H >> -DHAVE_PTHREAD_NP_H -DHAVE_STRTOF -DHAVE_MKOSTEMP -DHAVE_MEMFD_CREATE >> -DHAVE_FLOCK -DHAVE_STRTOK_R -DHAVE_GETRANDOM -DHAVE_QSORT_S >> -DHAVE_POSIX_FALLOCATE -DHAVE_SECURE_GETENV -DHAVE_GNU_QSORT_R >> -DHAVE_STRUCT_TIMESPEC -DHAVE_POSIX_MEMALIGN -DHAVE_DIRENT_D_TYPE >> -DHAVE_STRTOD_L -DHAVE_DLADDR -DHAVE_DL_ITERATE_PHDR >> -DSUPPORT_INTEL_INTEGRATED_GPUS -DHAVE_ZLIB -DHAVE_ZSTD -DHAVE_COMPRESSION >> -DHAVE_PTHREAD -DHAVE_LIBDRM '-DMESA_LLVM_VERSION_STRING="15.0.7"' >> -DLLVM_IS_SHARED=1 -DLLVM_AVAILABLE=1 -DDRAW_LLVM_AVAILABLE=1 -DUSE_LIBELF >> -DWL_HIDE_DEPRECATED -DHAVE_DRI -DHAVE_DRI2 -DHAVE_DRI3 >> -DHAVE_DRI3_MODIFIERS -DHAVE_DRISW_KMS >> -Werror=implicit-function-declaration -Werror=missing-prototypes >> -Werror=return-type -Werror=empty-body -Werror=incompatible-pointer-types >> -Werror=int-conversion -Wimplicit-fallthrough -Wmisleading-indentation >> -Wno-missing-field-initializers -Wno-format-truncation -fno-math-errno >> -fno-trapping-math -Qunused-arguments -fno-common -Wno-unknown-pragmas >> -Wno-microsoft-enum-value -Wno-unused-function -Werror=format >> -Wformat-security -ffunction-sections -fdata-sections -Wno-unused-variable >> -Wno-unused-but-set-variable -O2 -pipe -fstack-protector-strong >> -fno-strict-aliasing -fPIC -pthread -Wno-override-init >> -Wno-initializer-overrides -MD -MQ >> src/intel/common/libintel_common.a.p/xe_intel_gem.c.o -MF >> src/intel/common/libintel_common.a.p/xe_intel_gem.c.o.d -o >> src/intel/common/libintel_common.a.p/xe_intel_gem.c.o -c >> ../src/intel/common/xe/intel_gem.c >> ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' >> 72 | case CLOCK_BOOTTIME: >> | ^ >> /usr/include/sys/_clock_id.h:81:25: note: expanded from macro >> 'CLOCK_BOOTTIME' >> 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC >> | ^ >> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro >> 'CLOCK_MONOTONIC' >> 56 | #define CLOCK_MONOTONIC 4 >> | ^ >> ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here >> 66 | case CLOCK_MONOTONIC: >> | ^ >> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro >> 'CLOCK_MONOTONIC' >> 56 | #define CLOCK_MONOTONIC 4 >> | ^ >> 1 error generated. >> >> -- >> Nuno Teixeira >> FreeBSD UNIX: <edua...@freebsd.org> Web: https://FreeBSD.org >> > >
I have a patch ready to go. I'll commit it tonight. -- Cheers, Cy Schubert <cy.schub...@cschubert.com> FreeBSD UNIX: <c...@freebsd.org> Web: https://FreeBSD.org NTP: <c...@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0 Pardon the typos. Small keyboard in use.
