From cff7933fa135fc184e4909aaae171463139884ed Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 22 Aug 2019 19:27:12 +0800
Subject: [PATCH] update linux-at91 to 4.9.151-linux4sam_5.8 and patch for SPI,RT5370, update rootfs with rootfs.changelog
---
3rdparty/zbar/build.sh | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/3rdparty/zbar/build.sh b/3rdparty/zbar/build.sh
index f16d794..4f7a62f 100755
--- a/3rdparty/zbar/build.sh
+++ b/3rdparty/zbar/build.sh
@@ -11,7 +11,7 @@
LYFTP_SRC=ftp://master.iot-yun.club/src/
-CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
+CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
function msg_banner()
{
@@ -62,7 +62,7 @@
PACK_SUFIX=tar.bz2
if [ -f ${PREFIX_PATH}/bin/zbarcam ] ; then
- echo "$SRC_NAME already compile and installed"
+ msg_banner "$SRC_NAME already compile and installed"
return 0;
fi
@@ -83,12 +83,17 @@
autoreconf --install
+ sed -i -e "s|-Wno-parentheses -Werror|-Wno-parentheses|g" configure
+
CFLAGS="-DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16" \
./configure --host=arm-linux --enable-static --enable-shared --prefix=$PREFIX_PATH \
--without-gtk --without-python --without-qt --without-x --without-java \
--with-imagemagick=${PREFIX_PATH}/ --without-graphicsmagick \
MAGICK_CFLAGS=-I${PREFIX_PATH}//include/ImageMagick-6 \
- MAGICK_LIBS="-L${PREFIX_PATH}/lib -lMagickWand-6.Q16 -lMagickCore-6.Q16 -lm -lz -L`pwd`/zbar/.libs/ -lzbar "
+ MAGICK_LIBS="-L${PREFIX_PATH}/lib -lMagickWand-6.Q16 -lMagickCore-6.Q16 -lm -lz -L`pwd`/zbar/.libs/ -lzbar"
+ #LIBS="-liconv"
+
+ sed -i -e "s|^LIBS = -lpthread.*|LIBS = -lpthread -liconv|g" Makefile
mkdir -p ./doc/man/
touch ./doc/man/zbarimg.1
@@ -98,10 +103,13 @@
cd -
}
-cd ../zlib
+cd ../iconv
./build.sh
cd -
+cd ../zlib
+ ./build.sh
+cd -
cd ../imageMagick
./build.sh
--
Gitblit v1.9.1