diff options
| author | nia <nia@pkgsrc.org> | 2019-10-04 18:08:07 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-10-04 18:08:07 +0000 |
| commit | 07b480ff86c1f220b44db38480e1ebd14534a8a8 (patch) | |
| tree | c5b63e81aaae3e911f6f215b4380243a94dfd4ec /archivers/advancecomp | |
| parent | 03d4f52f0bfaf2f7774977e83f528ed6e1605e52 (diff) | |
| download | pkgsrc-07b480ff86c1f220b44db38480e1ebd14534a8a8.tar.gz | |
advancecomp: Avoid compiler warnings due to redefining bswap* on NetBSD.
Diffstat (limited to 'archivers/advancecomp')
| -rw-r--r-- | archivers/advancecomp/distinfo | 4 | ||||
| -rw-r--r-- | archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/archivers/advancecomp/distinfo b/archivers/advancecomp/distinfo index 94558101d5e..e6faf8c3194 100644 --- a/archivers/advancecomp/distinfo +++ b/archivers/advancecomp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2019/10/04 18:02:48 nia Exp $ +$NetBSD: distinfo,v 1.11 2019/10/04 18:08:07 nia Exp $ SHA1 (advancecomp-2.1.tar.gz) = 2699fd24c2175bece1f8fb68d40f13db86480048 RMD160 (advancecomp-2.1.tar.gz) = 9a67286906113a26b5e8f2e155c408c1b0b935c8 @@ -7,4 +7,4 @@ Size (advancecomp-2.1.tar.gz) = 1292135 bytes SHA1 (patch-aa) = ddc8b6981e1e0b46ac6291aee65d56cdae9f0998 SHA1 (patch-ab) = 1e6e10943bd2a414d4f704bd94b1de3d1036dd90 SHA1 (patch-ac) = d08d44224c4351c66c920b26bacc3f749a54d31a -SHA1 (patch-libdeflate_compiler__gcc.h) = e7d0c01f7fae2ea53e74edd0e849e9243b132661 +SHA1 (patch-libdeflate_compiler__gcc.h) = 5e8fe8d3a7d45097cbc04523c2085ef38c7d0de0 diff --git a/archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h b/archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h new file mode 100644 index 00000000000..ce23d57b258 --- /dev/null +++ b/archivers/advancecomp/patches/patch-libdeflate_compiler__gcc.h @@ -0,0 +1,24 @@ +$NetBSD: patch-libdeflate_compiler__gcc.h,v 1.3 2019/10/04 18:08:07 nia Exp $ + +Avoid conflicts due to changing the prototypes of bswap32 and co. + +--- libdeflate/compiler_gcc.h.orig 2017-01-24 17:51:01.000000000 +0000 ++++ libdeflate/compiler_gcc.h +@@ -93,6 +93,9 @@ + # define CPU_IS_LITTLE_ENDIAN() (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + #endif + ++#ifdef __NetBSD__ ++#include <sys/endian.h> ++#else + #if GCC_PREREQ(4, 8) || __has_builtin(__builtin_bswap16) + # define bswap16 __builtin_bswap16 + #endif +@@ -104,6 +107,7 @@ + #if GCC_PREREQ(4, 3) || __has_builtin(__builtin_bswap64) + # define bswap64 __builtin_bswap64 + #endif ++#endif + + #if defined(__x86_64__) || defined(__i386__) || defined(__ARM_FEATURE_UNALIGNED) + # define UNALIGNED_ACCESS_IS_FAST 1 |