Fix travis build by helping clang and cross

diff --git a/Makefile.in b/Makefile.in
index 1d89e0251d65bfd6dc9b7d949b74474b15e3d222..59783d287ca5d18b1217ad7e501b8777d4511e5d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,9 +133,17 @@ libb2_options = \
     --disable-shared \
     --enable-static
 
+# cross compilation
+libb2_options += \
+    --build=@build_alias@ \
+    --host=@host_alias@ \
+    --target=@target_alias@ \
+    --disable-fat \
+    --disable-native
+
 src/libb2/src/.libs/libb2.a:
-       cd src/libb2 && ./configure --build=@build_alias@ --host=@host_alias@ --target=@target_alias@ ${libb2_options}
-       $(MAKE) -C src/libb2 CC="$(CC)"
+       cd src/libb2 && ./configure ${libb2_options} CC="$(CC)"
+       $(MAKE) -C src/libb2 CC="$(CC)" CFLAGS="$(CFLAGS)"
 
 .PHONY: performance
 performance: ccache$(EXEEXT)

diff --git a/configure.ac b/configure.ac
index 06a3b33e937b7c8ee270135bc3e9b0a672635a00..d5d6a28aca50c4e3f8ff6b465e39aa7312226d29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,8 @@ else
     (cd src && tar -xzf ../${libb2_archive})
     rm -rf src/libb2
     mv src/libb2-${libb2_version} src/libb2
+    # try to make clang happy by changing the header guard macros
+    sed -i -e 's/__BLAKE2_H__/BLAKE2_H/' src/libb2/src/blake2.h
     CPPFLAGS="$CPPFLAGS -I$srcdir/src/libb2/src"
     extra_libs="$extra_libs src/libb2/src/.libs/libb2.a"
 fi