[pkgsrc/trunk]: pkgsrc/archivers/advancecomp Avoid type conflicts with compil...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14e7eea78fa6
branches:  trunk
changeset: 361126:14e7eea78fa6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 14 17:48:56 2017 +0000

description:
Avoid type conflicts with compiler builtins by including the correct
system header first before defining macros of the same name.

diffstat:

 archivers/advancecomp/distinfo                                 |   3 +-
 archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h |  16 ++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 1ea957207d78 -r 14e7eea78fa6 archivers/advancecomp/distinfo
--- a/archivers/advancecomp/distinfo    Fri Apr 14 17:16:50 2017 +0000
+++ b/archivers/advancecomp/distinfo    Fri Apr 14 17:48:56 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/04/11 13:47:08 mef Exp $
+$NetBSD: distinfo,v 1.9 2017/04/14 17:48:56 joerg Exp $
 
 SHA1 (advancecomp-1.23.tar.gz) = 0c6d24c4a01eed5e229cb1fda2017fdce0a26fbc
 RMD160 (advancecomp-1.23.tar.gz) = cd99a36ba2d4d428d08e91c566228550f41bd9f5
@@ -7,3 +7,4 @@
 SHA1 (patch-aa) = ddc8b6981e1e0b46ac6291aee65d56cdae9f0998
 SHA1 (patch-ab) = 1e6e10943bd2a414d4f704bd94b1de3d1036dd90
 SHA1 (patch-ac) = d08d44224c4351c66c920b26bacc3f749a54d31a
+SHA1 (patch-libdeflate_compiler__gcc.h) = e7d0c01f7fae2ea53e74edd0e849e9243b132661
diff -r 1ea957207d78 -r 14e7eea78fa6 archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h    Fri Apr 14 17:48:56 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-libdeflate_compiler__gcc.h,v 1.1 2017/04/14 17:48:56 joerg Exp $
+
+--- libdeflate/compiler_gcc.h.orig     2017-04-12 14:01:12.705351515 +0000
++++ libdeflate/compiler_gcc.h
+@@ -3,6 +3,11 @@
+  * handles clang and the Intel C Compiler.
+  */
+ 
++#ifdef __NetBSD__
++/* Avoid conflicts due to changing the prototypes of bswap32 and co. */
++#include <sys/endian.h>
++#endif
++
+ #define GCC_PREREQ(major, minor)              \
+       (__GNUC__ > (major) ||                  \
+        (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))