This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new ca0fac0 [chore](ldb-toolchain) Support ldb_toolchain on ubuntu 20
(#7846)
ca0fac0 is described below
commit ca0fac0722a07e6d58cf00870bc2676707f521b7
Author: Amos Bird <[email protected]>
AuthorDate: Mon Jan 24 13:16:37 2022 +0800
[chore](ldb-toolchain) Support ldb_toolchain on ubuntu 20 (#7846)
---
thirdparty/build-thirdparty.sh | 6 +++---
thirdparty/patches/mysql-server-mysql-5.7.18.patch | 12 ++++++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index b383b58..a73a4ab 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -265,9 +265,9 @@ build_thrift() {
# NOTE(amos): libtool discard -static. --static works.
./configure CPPFLAGS="-I${TP_INCLUDE_DIR}" LDFLAGS="-L${TP_LIB_DIR}
--static" LIBS="-lcrypto -ldl -lssl" CFLAGS="-fPIC" \
--prefix=$TP_INSTALL_DIR --docdir=$TP_INSTALL_DIR/doc --enable-static
--disable-shared --disable-tests \
- --disable-tutorial --without-qt4 --without-qt5 --without-csharp
--without-erlang --without-nodejs \
- --without-lua --without-perl --without-php --without-php_extension
--without-dart --without-ruby \
- --without-haskell --without-go --without-haxe --without-d --without-python
-without-java -without-rs --with-cpp \
+ --disable-tutorial --without-qt4 --without-qt5 --without-csharp
--without-erlang --without-nodejs --without-nodets --without-swift \
+ --without-lua --without-perl --without-php --without-php_extension
--without-dart --without-ruby --without-cl \
+ --without-haskell --without-go --without-haxe --without-d --without-python
-without-java --without-dotnetcore -without-rs --with-cpp \
--with-libevent=$TP_INSTALL_DIR --with-boost=$TP_INSTALL_DIR
--with-openssl=$TP_INSTALL_DIR
if [ -f compiler/cpp/thrifty.hh ];then
diff --git a/thirdparty/patches/mysql-server-mysql-5.7.18.patch
b/thirdparty/patches/mysql-server-mysql-5.7.18.patch
index f7e87a3..0c18b72 100644
--- a/thirdparty/patches/mysql-server-mysql-5.7.18.patch
+++ b/thirdparty/patches/mysql-server-mysql-5.7.18.patch
@@ -51,3 +51,15 @@ diff -uprN a/cmd-line-utils/libedit/terminal.c
b/cmd-line-utils/libedit/terminal
if (term == NULL)
+diff -uprN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2022-01-23 23:30:48.915006943 +0800
++++ b/CMakeLists.txt 2022-01-23 23:31:04.785141731 +0800
+@@ -484,8 +484,6 @@ INCLUDE_DIRECTORIES(
+ MYSQL_CHECK_ZLIB_WITH_COMPRESS()
+ # Add bundled yassl/taocrypt or system openssl.
+ MYSQL_CHECK_SSL()
+-# Add system/bundled editline.
+-MYSQL_CHECK_EDITLINE()
+ # Add libevent
+ MYSQL_CHECK_LIBEVENT()
+ # Add lz4 library
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
