ShannonDing closed pull request #49: Hotfix:auto build error
URL: https://github.com/apache/rocketmq-client-cpp/pull/49
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.sh b/build.sh
index 5407fac4..2261238e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -156,7 +156,7 @@ BuildLibevent()
else
wget
https://github.com/libevent/libevent/archive/${fname_libevent_down} -O
libevent-${fname_libevent_down}
fi
- unzip -o ${fname_libevent} > libevent.txt 2>&1
+ unzip -o ${fname_libevent}
if [ $? -ne 0 ];then
exit 1
fi
@@ -198,7 +198,7 @@ BuildJsonCPP()
else
wget
https://github.com/open-source-parsers/jsoncpp/archive/${fname_jsoncpp_down} -O
jsoncpp-${fname_jsoncpp_down}
fi
- unzip -o ${fname_jsoncpp} > json.txt 2>&1
+ unzip -o ${fname_jsoncpp}
if [ $? -ne 0 ];then
exit 1
fi
@@ -242,7 +242,7 @@ BuildBoost()
else
wget
http://sourceforge.net/projects/boost/files/boost/${fname_boost_down}
fi
- tar -zxvf ${fname_boost} > boost.txt 2>&1
+ tar -zxvf ${fname_boost}
boost_dir=`ls | grep boost | grep .*[^gz]$`
cd ${boost_dir}
if [ $? -ne 0 ];then
@@ -253,8 +253,7 @@ BuildBoost()
exit 1
fi
echo "build boost static #####################"
- pwd
- ./b2 cflags=-fPIC cxxflags=-fPIC --with-atomic --with-thread
--with-system --with-chrono --with-date_time --with-log --with-regex
--with-serialization --with-filesystem --with-locale --with-iostreams
threading=multi link=static release install --prefix=${install_lib_dir}
1>boostMakeLog.txt
+ ./b2 cflags=-fPIC cxxflags=-fPIC --with-atomic --with-thread --with-system
--with-chrono --with-date_time --with-log --with-regex --with-serialization
--with-filesystem --with-locale --with-iostreams threading=multi link=static
runtime-link=static release install --prefix=${install_lib_dir}
if [ $? -ne 0 ];then
exit 1
fi
@@ -297,7 +296,7 @@ BuildGoogleTest()
wget https://github.com/abseil/googletest/archive/release-1.8.1.tar.gz
fi
if [ ! -d "googletest-release-1.8.1" ];then
- tar -zxvf release-1.8.1.tar.gz > googletest.txt 2>&1
+ tar -zxvf release-1.8.1.tar.gz
fi
cd googletest-release-1.8.1
mkdir build; cd build
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
