[openwrt/openwrt] mkhash: fix build errors on FreeBSD 13.0

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 5 12:15:54 PST 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1324403eb6c65baa77dd83d1aa9fbd385b877826

commit 1324403eb6c65baa77dd83d1aa9fbd385b877826
Author: Georgi Valkov <gvalkov at abv.bg>
AuthorDate: Thu Mar 3 17:04:38 2022 +0200

    mkhash: fix build errors on FreeBSD 13.0
    
    be64enc, be16dec, and be32dec are declared on FreeBSD 13.0, in
    /usr/include/sys/endian.h so we should not declare them.
    
    Fixes the following error during feeds update:
    staging_dir/host/bin/mkhash: No such file or directory
    
    gcc scripts/mkhash.c
    scripts/mkhash.c:111:1: error: redefinition of 'be64enc'
      111 | be64enc(void *buf, uint64_t u)
    
    Signed-off-by: Georgi Valkov <gvalkov at abv.bg>
---
 scripts/mkhash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mkhash.c b/scripts/mkhash.c
index ed3d42d4c3..a28d5fd537 100644
--- a/scripts/mkhash.c
+++ b/scripts/mkhash.c
@@ -105,7 +105,6 @@ be32enc(void *buf, uint32_t u)
 	p[2] = ((uint8_t) ((u >> 8) & 0xff));
 	p[3] = ((uint8_t) (u & 0xff));
 }
-#endif
 
 static void
 be64enc(void *buf, uint64_t u)
@@ -132,6 +131,7 @@ be32dec(const void *buf)
 
 	return (((uint32_t) be16dec(p)) << 16) | be16dec(p + 2);
 }
+#endif
 
 #define MD5_DIGEST_LENGTH	16
 




More information about the lede-commits mailing list