pkg/54823: MesaLib-19.2.7: building failure due to ALIGN() on FreeBSD

[triaxx%netbsd.org@localhost]

>Number:         54823
>Category:       pkg
>Synopsis:       MesaLib-19.2.7: building failure due to ALIGN() on FreeBSD
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 01 21:00:00 +0000 2020
>Originator:     Frédéric Fauberteau
>Release:        FreeBSD 12.0-RELEASE-p12 | pkgsrc-HEAD
>Organization:
>Environment:
System: FreeBSD cocoon.triaxx.org 12.0-RELEASE-p12 FreeBSD 12.0-RELEASE-p12 GENERIC  amd64
Architecture: x86_64
Machine: amd64
>Description:
$ bmake show-options
[...]
These options are currently enabled:
        llvm x11

$ bmake build
[...]
[619/1950] Compiling C object 'src/mesa/bbe4a73@@mesa_classic@sta/main_marshal.c.o'.
FAILED: src/mesa/bbe4a73@@mesa_classic@sta/main_marshal.c.o 
clang -Isrc/mesa/bbe4a73@@mesa_classic@sta -Isrc/mesa -I../src/mesa -Iinclude -I../include -Isrc -I../src -Isrc/mapi -I../src/mapi -I../src/gallium/include -Isrc/gallium/auxiliary -I../src/gallium/auxiliary -I../src/mesa/x86-64 -Isrc/mesa/main -I../src/mesa/main -Isrc/comp
iler/nir -I../src/compiler/nir -Isrc/mesa/program -Isrc/mapi/glapi/gen -Isrc/compiler -I/usr/pkg/include/libelf -I/usr/pkg/include/libLLVM -I/usr/pkg/include -I/usr/pkg/include/libdrm -I/usr/include -Xclang -fcolor-diagnostics -DNDEBUG -pipe -D_FILE_OFFSET_BITS=64 -std=c99
 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS '-DPACKAGE_VERSION="19.2.7"' '-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/issues";' -DUSE_ELF_TLS -DHAVE_ST_VDPAU -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 -DHAVE_X11_PLATFOR
M -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_DRM -DHAVE_DRM_PLATFORM -DHAVE_SURFACELESS_PLATFORM -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_FUNC_ATTRIBUTE_CONST -DHAVE_FUNC_ATTRIBUTE_FLATTEN -DHAVE_FUNC_ATTRIBUTE_MALLOC -DHAVE_FUNC_ATTRIBUTE_PURE -DHAVE_FUNC_AT
TRIBUTE_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_VISIBILITY -DHAVE_FUNC_ATTRIBUTE_ALIAS -DHAVE_FUNC_ATTRIBUTE_NORETURN -D
HAVE_UINT128 -DUSE_SSE41 -DUSE_GCC_ATOMIC_BUILTINS -DUSE_X86_64_ASM -DHAVE_XLOCALE_H -DHAVE_DLFCN_H -DHAVE_EXECINFO_H -DHAVE_SYS_SHM_H -DHAVE_STRTOF -DHAVE_MKOSTEMP -DHAVE_POSIX_MEMALIGN -DHAVE_TIMESPEC_GET -DHAVE_FLOCK -DHAVE_STRTOD_L -DHAVE_DLADDR -DHAVE_DL_ITERATE_PHDR 
-DHAVE_ZLIB -DHAVE_PTHREAD -DPTHREAD_SETAFFINITY_IN_NP_HEADER -DHAVE_LIBDRM -DHAVE_LLVM=0x0700 '-DMESA_LLVM_VERSION_STRING="7.0.1"' -DHAVE_DRI3 -DHAVE_DRI3_MODIFIERS -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=incompatible-p
ointer-types -Werror=format -Wformat-security -Wno-missing-field-initializers -fno-math-errno -fno-trapping-math -Qunused-arguments -O2 -DHAVE_NOATEXIT -DSYSCONFDIR=/usr/pkg/etc -fPIC -fvisibility=hidden -Werror=pointer-arith -Werror=vla -MD -MQ 'src/mesa/bbe4a73@@mesa_cla
ssic@sta/main_marshal.c.o' -MF 'src/mesa/bbe4a73@@mesa_classic@sta/main_marshal.c.o.d' -o 'src/mesa/bbe4a73@@mesa_classic@sta/main_marshal.c.o' -c ../src/mesa/main/marshal.c
In file included from ../src/mesa/main/marshal.c:32:
../src/mesa/main/marshal.h:58:44: error: too many arguments provided to function-like macro invocation
   const size_t aligned_size = ALIGN(size, 8);
                                           ^
/usr/include/machine/param.h:81:9: note: macro 'ALIGN' defined here
#define ALIGN(p)                _ALIGN(p)
        ^
In file included from ../src/mesa/main/marshal.c:32:
../src/mesa/main/marshal.h:58:17: warning: incompatible pointer to integer conversion initializing 'const size_t' (aka 'const unsigned long') with an expression of type 'uintptr_t (uintptr_t, int32_t)' (aka 'unsigned long (unsigned long, int)') [-Wint-conversion]
   const size_t aligned_size = ALIGN(size, 8);
                ^              ~~~~~
1 warning and 1 error generated.
ninja: build stopped: subcommand failed.
*** Error code 1

Stop.
bmake[1]: stopped in /usr/pkgsrc/graphics/MesaLib
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/MesaLib
>How-To-Repeat:
cd /usr/pkgsrc/graphics/MesaLib && bmake build
>Fix: