Bug#876848: haskell-cryptonite FTBFS on non-x86: error: redefinition of 'store_le32'

[Adrian Bunk]

Source: haskell-cryptonite
Version: 0.23-1
Severity: serious

https://buildd.debian.org/status/package.php?p=haskell-cryptonite&suite=sid

...
[119 of 119] Compiling Crypto.Cipher.AES ( Crypto/Cipher/AES.hs, dist-ghc/build/Crypto/Cipher/AES.p_o )

In file included from cbits/aes/block128.h:35:0: error:
    0,
                     from cbits/cryptonite_aes.h:36,
                     from cbits/aes/generic.c:35:

cbits/cryptonite_align.h:160:20: error:
     error: redefinition of 'store_le32'
     static inline void store_le32(uint8_t *dst, const uint32_t v)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:135:20: error:
     note: previous definition of 'store_le32' was here
     static inline void store_le32(uint8_t *p, uint32_t val)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:169:20: error:
     error: redefinition of 'store_be32'
     static inline void store_be32(uint8_t *dst, const uint32_t v)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:104:20: error:
     note: previous definition of 'store_be32' was here
     static inline void store_be32(uint8_t *p, uint32_t val)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:178:20: error:
     error: redefinition of 'store_le64'
     static inline void store_le64(uint8_t *dst, const uint64_t v)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:143:20: error:
     note: previous definition of 'store_le64' was here
     static inline void store_le64(uint8_t *p, uint64_t val)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:188:20: error:
     error: redefinition of 'store_be64'
     static inline void store_be64(uint8_t *dst, const uint64_t v)
                        ^~~~~~~~~~

cbits/cryptonite_align.h:112:20: error:
     note: previous definition of 'store_be64' was here
     static inline void store_be64(uint8_t *p, uint64_t val)
                        ^~~~~~~~~~
`gcc' failed in phase `C Compiler'. (Exit code: 1)
/usr/share/cdbs/1/class/hlibrary.mk:147: recipe for target 'build-ghc-stamp' failed
make: *** [build-ghc-stamp] Error 1


debian/patches/more-alignment.patch and upstream seem to add
the same code with different formatting to cryptonite_align.h