diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-06-27 15:00:45 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-06-27 15:00:45 +0000 |
| commit | 4517932e14fea18d2a787633feda3ed52f2d5ccd (patch) | |
| tree | 4139461cf5265eb8f7220eb01ff45e2ce1c545b6 | |
| parent | * bitlbee always links to libintl.so and the configure script has no NLS option, (diff) | |
www/libxul: unbreak on 12.0 after r320240
cc -o Unified_c_media_libnestegg_src0.o -c ... -std=gnu99 ... Unified_c_media_libnestegg_src0.c
In file included from obj-i386-unknown-freebsd12.0/media/libnestegg/src/Unified_c_media_libnestegg_src0.c:2:
In file included from media/libnestegg/src/halloc.c:19:
media/libnestegg/src/align.h:42:25: error: typedef redefinition with different types ('union max_align' vs '__max_align_t')
typedef union max_align max_align_t;
^
/usr/include/stddef.h:67:23: note: previous definition is here
typedef __max_align_t max_align_t;
^
1 error generated.
Reported by: pkg-fallout
| -rw-r--r-- | www/libxul/files/patch-bug1267513 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/www/libxul/files/patch-bug1267513 b/www/libxul/files/patch-bug1267513 new file mode 100644 index 000000000000..e3666e476a82 --- /dev/null +++ b/www/libxul/files/patch-bug1267513 @@ -0,0 +1,24 @@ +commit 3b7f1ae5dfd5 +Author: Matt Brubeck <mbrubeck@limpet.net> +Date: Mon Apr 25 09:33:12 2016 -0700 + + Don't redefine max_align_t if defined by GCC or Clang + + Fixes "conflicting types" error when building with `-std=c11`. +--- + halloc/src/align.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git media/libnestegg/src/align.h media/libnestegg/src/align.h +index 58c82b4354ff..1753b504fc2b 100644 +--- media/libnestegg/src/align.h ++++ media/libnestegg/src/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 |