Skip to content

Commit

Permalink
Merge pull request #214 from HappenLee/master
Browse files Browse the repository at this point in the history
Fixed bug which palo can't compiled by JDK 10, added the compile parameter CPPFLAGS of ncurses-6.0, prevent compilation error
  • Loading branch information
lide-reed authored Sep 20, 2018
2 parents e0d721f + d0768cb commit 9ac1669
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ if [ -z $JAVA_HOME ]; then
exit 1
fi
JAVA=${JAVA_HOME}/bin/java
JAVA_VER=$(${JAVA} -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
if [[ $JAVA_VER < 18 ]]; then
JAVA_VER=$(${JAVA} -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q' | cut -f1 -d " ")
if [ $JAVA_VER -lt 18 ]; then
echo "Require JAVA with JDK version at least 1.8"
exit 1
fi
Expand Down
6 changes: 3 additions & 3 deletions fs_brokers/apache_hdfs_broker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ if [ -z $JAVA_HOME ]; then
exit 1
fi
JAVA=${JAVA_HOME}/bin/java
JAVA_VER=$(${JAVA} -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
if [[ $JAVA_VER < 18 ]]; then
echo "Error: java version is too old" $JAVA_VER " need jdk 1.8."
JAVA_VER=$(${JAVA} -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q' | cut -f1 -d " ")
if [ $JAVA_VER -lt 18 ]; then
echo "Error: java version is too old" $JAVA_VER" need jdk 1.8."
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ build_ncurses() {
check_if_source_exist $NCURSES_SOURCE
cd $TP_SOURCE_DIR/$NCURSES_SOURCE

CPPFLAGS="-I${TP_INCLUDE_DIR}" \
CPPFLAGS="-I${TP_INCLUDE_DIR} -P" \
LDFLAGS="-L${TP_LIB_DIR}" \
CFLAGS="-fPIC" \
./configure --prefix=$TP_INSTALL_DIR
Expand Down

0 comments on commit 9ac1669

Please sign in to comment.