svn commit: r384340 - head/games/openbor/files

[John Marino]

On 4/20/2015 11:25, Jan Beich wrote:
> Author: jbeich
> Date: Mon Apr 20 09:25:51 2015
> New Revision: 384340
> URL: https://svnweb.freebsd.org/changeset/ports/384340
> 
> Log:
>   Unbreak build with gcc5 (and clang in future)
>   
>   In file included from source/webmlib/halloc/halloc.c:19:0:
>   source/webmlib/halloc/align.h:42:25: error: conflicting types for 'max_align_t'
>    typedef union max_align max_align_t;
>                            ^
>   In file included from source/webmlib/halloc/halloc.h:18:0,
>                    from source/webmlib/halloc/halloc.c:18:
>   /usr/local/lib/gcc5/gcc/x86_64-portbld-freebsd11.0/5.0.1/include/stddef.h:429:3: note: previous declaration of 'max_align_t' was here
>    } max_align_t;
>      ^
>   
>   Reported by:	DPorts
> 
> Added:
>   head/games/openbor/files/patch-source_webmlib_halloc_align.h   (contents, props changed)
> 
> +--- source/webmlib/halloc/align.h.orig	2015-04-09 22:13:36 UTC
> ++++ source/webmlib/halloc/align.h
> +@@ -22,7 +22,7 @@
> +  */
> + typedef double max_align_t;
> + 
> +-#else
> ++#elif !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T)
> + 
> + /*
> +  *	a type with the most strict alignment requirements
> 

Thanks!  It doesn't fix it on dports though (see below).
DragonFly has max_align_t in /usr/include/stddef.h and as a result does
not install the gcc version of stddef.h.

I've seen this error on another port -- we just renamed the type (it was
only showing in 2 places).

Regards,
John



cc -pipe -O2 -fno-strict-aliasing -DAMD64 -I"sdl" -I"'libpng-config"
-I"--prefix'/include/libpng" -I"." -I"source" -I"source/adpcmlib"
-I"source/gamelib" -I"source/preprocessorlib" -I"source/ramlib"
-I"source/randlib" -I"source/scriptlib" -I"source/pnglib"
-I"source/gfxlib" -I"source/webmlib" -I"/usr/local/include"  -DLINUX
-Wall -fsigned-char `pkg-config sdl2 --cflags`  -fno-ident -DSDL
-DOV_EXCLUDE_STATIC_CALLBACKS -DOPENGL -DLOADGL -DWEBM -c
source/webmlib/halloc/halloc.c -o source/webmlib/halloc/halloc.o
In file included from source/webmlib/halloc/halloc.c:19:0:
source/webmlib/halloc/align.h:42:25: error: conflicting types for
'max_align_t'
 typedef union max_align max_align_t;
                         ^
In file included from source/webmlib/halloc/halloc.h:18:0,
                 from source/webmlib/halloc/halloc.c:18:
/usr/include/stddef.h:78:3: note: previous declaration of 'max_align_t'
was here
 } max_align_t;
   ^
Makefile:783: recipe for target 'source/webmlib/halloc/halloc.o' failed