Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(thirdparty): add thirdparty for centos6 build env #1017

Merged
merged 7 commits into from
Jul 6, 2022
Merged

build(thirdparty): add thirdparty for centos6 build env #1017

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8896b2
fix
foreverneverer Jun 24, 2022
70c5930
fix
foreverneverer Jun 24, 2022
1db2272
Merge branch 'master' into centos-thirdparty-fix
acelyc111 Jun 27, 2022
04ab9d3
Merge branch 'master' into centos-thirdparty-fix
foreverneverer Jun 30, 2022
29f8a71
Merge branch 'master' into centos-thirdparty-fix
foreverneverer Jul 1, 2022
1ff7290
fix
foreverneverer Jul 4, 2022
bdcf917
Merge branch 'master' into centos-thirdparty-fix
foreverneverer Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docker/pegasus-build-env/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ RUN yum -y install centos-release-scl \
lz4-devel \
bison \
flex \
krb5-devel \
cyrus-sasl-devel \
patch; \
yum clean all; \
rm -rf /var/cache/yum;
Expand Down
2 changes: 0 additions & 2 deletions docker/pegasus-build-env/ubuntu1604/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
libkrb5-dev \
libsasl2-dev \
maven \
flex; \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 0 additions & 2 deletions docker/pegasus-build-env/ubuntu1804/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
libkrb5-dev \
libsasl2-dev \
maven \
flex; \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 0 additions & 2 deletions docker/pegasus-build-env/ubuntu2004/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
libkrb5-dev \
libsasl2-dev \
maven \
flex; \
rm -rf /var/lib/apt/lists/*
Expand Down
28 changes: 28 additions & 0 deletions rdsn/thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,33 @@ ExternalProject_Add(thrift
DEPENDS boost
)

# kerberos
ExternalProject_Add(krb5
acelyc111 marked this conversation as resolved.
Show resolved Hide resolved
URL ${OSS_URL_PREFIX}/krb5-1.16.1.tar.gz
acelyc111 marked this conversation as resolved.
Show resolved Hide resolved
http://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.1.tar.gz
URL_MD5 848e9b80d6aaaa798e3f3df24b83c407
CONFIGURE_COMMAND cd src && ./configure --prefix=${TP_OUTPUT}
BUILD_COMMAND cd src && make
INSTALL_COMMAND cd src && make install
BUILD_IN_SOURCE 1
)

# cyrus-sasl
ExternalProject_Add(cyrus-sasl
URL ${OSS_URL_PREFIX}/cyrus-sasl-2.1.27.tar.gz
http://www.cyrusimap.org/releases/cyrus-sasl-2.1.27.tar.gz
URL_MD5 a33820c66e0622222c5aefafa1581083
CONFIGURE_COMMAND ./configure --prefix=${TP_OUTPUT}
--enable-gssapi=${TP_OUTPUT}
--enable-scram=no
--enable-digest=no
--enable-cram=no
--enable-otp=no
BUILD_COMMAND make
INSTALL_COMMAND make install
BUILD_IN_SOURCE 1
)

check_cxx_compiler_flag(-Wformat-overflow COMPILER_SUPPORTS_FORMAT_OVERFLOW)
if (COMPILER_SUPPORTS_FORMAT_OVERFLOW)
set(ZOOKEEPER_CFLAGS -Wno-error=format-overflow)
Expand All @@ -176,6 +203,7 @@ ExternalProject_Add(zookeeper
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
add_dependencies(zookeeper cyrus-sasl krb5)

ExternalProject_Add(libevent
URL ${OSS_URL_PREFIX}/libevent-release-2.1.8-stable.tar.gz
Expand Down
2 changes: 2 additions & 0 deletions scripts/pack_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ copy_file ./rdsn/thirdparty/output/lib/libPoco*.so.* ${pack}/bin
copy_file ./rdsn/thirdparty/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/bin
copy_file ./rdsn/thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/bin
copy_file ./rdsn/thirdparty/output/lib/libhdfs* ${pack}/bin
copy_file ./rdsn/thirdparty/output/lib/libsasl*.so.* ${pack}/bin
copy_file ./rdsn/thirdparty/output/lib/libcom_err*.so.* ${pack}/bin
copy_file ./scripts/sendmail.sh ${pack}/bin
copy_file ./src/server/config.ini ${pack}/bin
copy_file ./src/server/config.min.ini ${pack}/bin
Expand Down