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

apache · Jul 6, 2022 · 862c824 · 862c824
1 parent c7633c4
commit 862c824
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/docker/pegasus-build-env/centos7/Dockerfile b/docker/pegasus-build-env/centos7/Dockerfile
@@ -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;

diff --git a/docker/pegasus-build-env/ubuntu1604/Dockerfile b/docker/pegasus-build-env/ubuntu1604/Dockerfile
@@ -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/*

diff --git a/docker/pegasus-build-env/ubuntu1804/Dockerfile b/docker/pegasus-build-env/ubuntu1804/Dockerfile
@@ -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/*

diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile b/docker/pegasus-build-env/ubuntu2004/Dockerfile
@@ -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/*

diff --git a/rdsn/thirdparty/CMakeLists.txt b/rdsn/thirdparty/CMakeLists.txt
@@ -159,6 +159,33 @@ ExternalProject_Add(thrift
         DEPENDS boost
         )
 
+# kerberos
+ExternalProject_Add(krb5
+        URL ${OSS_URL_PREFIX}/krb5-1.16.1.tar.gz
+        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)
@@ -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

diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh
@@ -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