From 6926ca6d6e6e6fb4d8e44f21fc5f8e523277a4b3 Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Fri, 5 Feb 2021 15:41:16 -0600 Subject: [PATCH] MCOL-4535: remove readline --- .drone.jsonnet | 4 ++-- CMakeLists.txt | 8 -------- build/README.md | 1 - cmake/configureEngine.cmake | 1 - cmake/cpackEngineDEB.cmake | 6 +++--- mcsconfig.h.in | 3 --- oamapps/columnstoreDB/CMakeLists.txt | 2 +- oamapps/columnstoreSupport/CMakeLists.txt | 2 +- 8 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e18ec314f..85d2d64ff 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -11,9 +11,9 @@ local server_ref_map = { local builddir = 'verylongdirnameforverystrangecpackbehavior'; local cmakeflags = '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPLUGIN_COLUMNSTORE=YES -DPLUGIN_XPAND=NO -DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_TOKUDB=NO -DPLUGIN_CONNECT=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_SPHINX=NO -DWITH_WSREP=OFF'; -local rpm_build_deps = 'install -y systemd-devel git make gcc gcc-c++ libaio-devel openssl-devel boost-devel bison snappy-devel flex libcurl-devel libxml2-devel ncurses-devel automake libtool policycoreutils-devel rpm-build lsof iproute pam-devel perl-DBI cracklib-devel expect readline-devel createrepo'; +local rpm_build_deps = 'install -y systemd-devel git make gcc gcc-c++ libaio-devel openssl-devel boost-devel bison snappy-devel flex libcurl-devel libxml2-devel ncurses-devel automake libtool policycoreutils-devel rpm-build lsof iproute pam-devel perl-DBI cracklib-devel expect createrepo'; -local deb_build_deps = 'apt update && apt install --yes --no-install-recommends dpkg-dev systemd libsystemd-dev git ca-certificates devscripts equivs build-essential libboost-all-dev libdistro-info-perl flex pkg-config automake libtool lsb-release bison chrpath cmake dh-apparmor dh-systemd gdb libaio-dev libcrack2-dev libjemalloc-dev libjudy-dev libkrb5-dev libncurses5-dev libpam0g-dev libpcre3-dev libreadline-gplv2-dev libsnappy-dev libssl-dev libsystemd-dev libxml2-dev unixodbc-dev uuid-dev zlib1g-dev libcurl4-openssl-dev dh-exec libpcre2-dev libzstd-dev psmisc socat expect net-tools rsync lsof libdbi-perl iproute2 gawk && mk-build-deps debian/control && dpkg -i mariadb-10*.deb || true && apt install -fy --no-install-recommends'; +local deb_build_deps = 'apt update && apt install --yes --no-install-recommends dpkg-dev systemd libsystemd-dev git ca-certificates devscripts equivs build-essential libboost-all-dev libdistro-info-perl flex pkg-config automake libtool lsb-release bison chrpath cmake dh-apparmor dh-systemd gdb libaio-dev libcrack2-dev libjemalloc-dev libjudy-dev libkrb5-dev libncurses5-dev libpam0g-dev libpcre3-dev libsnappy-dev libssl-dev libsystemd-dev libxml2-dev unixodbc-dev uuid-dev zlib1g-dev libcurl4-openssl-dev dh-exec libpcre2-dev libzstd-dev psmisc socat expect net-tools rsync lsof libdbi-perl iproute2 gawk && mk-build-deps debian/control && dpkg -i mariadb-10*.deb || true && apt install -fy --no-install-recommends'; local platformMap(branch, platform) = local branch_cmakeflags_map = { diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ed428c3f..2cbcf1c07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,14 +299,6 @@ SET (ENGINE_UTILS_UDFSDK_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/udfsdk" SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_CURRENT_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) -IF (MY_READLINE_INCLUDE_DIR) - SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${MY_READLINE_INCLUDE_DIR}) - SET (ENGINE_READLINE_LIBRARY ${MY_READLINE_LIBRARY}) -ELSE () - SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} "/usr/include/readline/") - SET (ENGINE_READLINE_LIBRARY "readline") -ENDIF () - SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_OAMAPPS_ALARMMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE} ${ENGINE_SERVER_WSREP_API_INCLUDE} ${ENGINE_SERVER_WSREP_INCLUDE} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_UTILS_LIBMYSQL_CL_INCLUDE} ${ENGINE_DATATYPES_INCLUDE}) ADD_SUBDIRECTORY(dbcon/mysql) diff --git a/build/README.md b/build/README.md index a5b177942..39cde32aa 100644 --- a/build/README.md +++ b/build/README.md @@ -11,7 +11,6 @@ Along with a working C++ compiler and GNU software development tools you will ne * zlib-devel * ncurses-devel * libxml2-devel - * readline-devel Clone or download this repository. diff --git a/cmake/configureEngine.cmake b/cmake/configureEngine.cmake index 7626f9edc..07c5326d6 100644 --- a/cmake/configureEngine.cmake +++ b/cmake/configureEngine.cmake @@ -28,7 +28,6 @@ CHECK_INCLUDE_FILE_CXX (memory.h HAVE_MEMORY_H) CHECK_INCLUDE_FILE_CXX (ncurses.h HAVE_NCURSES_H) CHECK_INCLUDE_FILE_CXX (netdb.h HAVE_NETDB_H) CHECK_INCLUDE_FILE_CXX (netinet/in.h HAVE_NETINET_IN_H) -CHECK_INCLUDE_FILE_CXX (readline/readline.h HAVE_READLINE_READLINE_H) CHECK_INCLUDE_FILE_CXX (stddef.h HAVE_STDDEF_H) CHECK_INCLUDE_FILE_CXX (stdint.h HAVE_STDINT_H) CHECK_INCLUDE_FILE_CXX (stdlib.h HAVE_STDLIB_H) diff --git a/cmake/cpackEngineDEB.cmake b/cmake/cpackEngineDEB.cmake index 6cb1395f9..ee2162b70 100644 --- a/cmake/cpackEngineDEB.cmake +++ b/cmake/cpackEngineDEB.cmake @@ -56,11 +56,11 @@ if (EXISTS "/etc/debian_version") set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}") endif () if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8") - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1, MariaDB-server, python3") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, rsync, net-tools, libboost-all-dev, libsnappy1, MariaDB-server, python3") elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9") - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1v5, libreadline5, MariaDB-server, python3") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, rsync, net-tools, libboost-all-dev, libsnappy1v5, MariaDB-server, python3") else() - SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, MariaDB-server, python3") + SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libboost-all-dev, rsync, libsnappy1v5, net-tools, MariaDB-server, python3") endif () set(CPACK_DEBIAN_COLUMNSTORE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;") diff --git a/mcsconfig.h.in b/mcsconfig.h.in index 2f7e141b0..46cf5b153 100644 --- a/mcsconfig.h.in +++ b/mcsconfig.h.in @@ -117,9 +117,6 @@ /* Define to 1 if the system has the type `ptrdiff_t'. */ #cmakedefine HAVE_PTRDIFF_T 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_READLINE_READLINE_H 1 - /* Define to 1 if you have the `regcomp' function. */ #cmakedefine HAVE_REGCOMP 1 diff --git a/oamapps/columnstoreDB/CMakeLists.txt b/oamapps/columnstoreDB/CMakeLists.txt index e2a3612a2..b82945012 100644 --- a/oamapps/columnstoreDB/CMakeLists.txt +++ b/oamapps/columnstoreDB/CMakeLists.txt @@ -8,7 +8,7 @@ set(columnstoreDBWrite_SRCS columnstoreDB.cpp) add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS}) -target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt index 6f55537f3..9cf02c4ca 100644 --- a/oamapps/columnstoreSupport/CMakeLists.txt +++ b/oamapps/columnstoreSupport/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS}) target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result) -target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)