muyuhang closed pull request #214: Fixed bug which palo can't compiled by JDK
10, added the compile parameter CPPFLAGS of ncurses-6.0, prevent compilation
error
URL: https://github.com/apache/incubator-doris/pull/214
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 3a77526..5873c9d 100755
--- a/build.sh
+++ b/build.sh
@@ -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
diff --git a/fs_brokers/apache_hdfs_broker/build.sh
b/fs_brokers/apache_hdfs_broker/build.sh
index e4da517..7321173 100755
--- a/fs_brokers/apache_hdfs_broker/build.sh
+++ b/fs_brokers/apache_hdfs_broker/build.sh
@@ -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
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 03846c0..b2db78d 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -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
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
