Skip to content

Commit

Permalink
Merge branch 'feature_master_ncurses' into 'master'
Browse files Browse the repository at this point in the history
Feature master ncurses

See merge request oceanbase-ce-publish/obclient!2
  • Loading branch information
致云 committed Jan 6, 2025
2 parents 513acc8 + 480d323 commit 571fb52
Show file tree
Hide file tree
Showing 8 changed files with 1,453 additions and 1,022 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,11 @@ OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protec
IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN)
# security-enhancing flags
MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")

IF(UNIX AND NOT APPLE)
MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
ENDIF()

MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
ENDIF()
Expand Down
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ cmake . \
-DOPENSSL_SSL_LIBRARY=$DEP_DIR/lib/libssl.a \
-DOPENSSL_CRYPTO_LIBRARY=$DEP_DIR/lib/libcrypto.a \
-DCURSES_CURSES_H_PATH=$DEP_DIR/include \
-DCURSES_CURSES_LIBRARY=$DEP_DIR/lib/libcurses.so \
-DCURSES_CURSES_LIBRARY=$DEP_DIR/lib/libcurses.a \
-DCURSES_HAVE_CURSES_H=$DEP_DIR/include/curses.h \
-DCURSES_INCLUDE_PATH=$DEP_DIR/include \
-DCURSES_LIBRARY=$DEP_DIR/lib/libcurses.so \
-DCURSES_NCURSES_LIBRARY=$DEP_DIR/lib/libncurses.so \
-DCURSES_FORM_LIBRARY=$DEP_DIR/lib/libform.so \
-DCURSES_LIBRARY=$DEP_DIR/lib/libcurses.a \
-DCURSES_NCURSES_LIBRARY=$DEP_DIR/lib/libncurses.a \
-DCURSES_FORM_LIBRARY=$DEP_DIR/lib/libform.a \
-DWITH_ZLIB=system \
-DWITH_LIBWRAP=0 \
-DENABLED_LOCAL_INFILE=1 \
Expand Down
Loading

0 comments on commit 571fb52

Please sign in to comment.