This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 26b99e1e8 Revert "build(thirdparty): add thirdparty for centos6 build
env (#1017)" (#1600)
26b99e1e8 is described below
commit 26b99e1e80efc40d8c1569de35070004cd72df18
Author: Yingchun Lai <[email protected]>
AuthorDate: Sun Sep 10 10:32:46 2023 +0800
Revert "build(thirdparty): add thirdparty for centos6 build env (#1017)"
(#1600)
* Revert "build(thirdparty): add thirdparty for centos6 build env (#1017)"
This reverts commit 862c824231bcc8309444e62d7b2d40523c8ea742.
* push master images
* run ASAN in Ubuntu 2204
* revert
* 1804
* 1804
---
.github/workflows/thirdparty-regular-push.yml | 2 +-
docker/pegasus-build-env/centos7/Dockerfile | 2 ++
docker/pegasus-build-env/ubuntu1804/Dockerfile | 2 ++
docker/pegasus-build-env/ubuntu2004/Dockerfile | 2 ++
docker/pegasus-build-env/ubuntu2204/Dockerfile | 2 ++
scripts/pack_server.sh | 2 --
thirdparty/CMakeLists.txt | 32 --------------------------
7 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/thirdparty-regular-push.yml
b/.github/workflows/thirdparty-regular-push.yml
index 152fe15a7..4fb58b59a 100644
--- a/.github/workflows/thirdparty-regular-push.yml
+++ b/.github/workflows/thirdparty-regular-push.yml
@@ -144,7 +144,7 @@ jobs:
fail-fast: false
matrix:
osversion:
- - ubuntu2204
+ - ubuntu1804
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
diff --git a/docker/pegasus-build-env/centos7/Dockerfile
b/docker/pegasus-build-env/centos7/Dockerfile
index 5c536166c..0e89f316b 100644
--- a/docker/pegasus-build-env/centos7/Dockerfile
+++ b/docker/pegasus-build-env/centos7/Dockerfile
@@ -50,6 +50,8 @@ 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/ubuntu1804/Dockerfile
b/docker/pegasus-build-env/ubuntu1804/Dockerfile
index c1e53891a..667b64120 100644
--- a/docker/pegasus-build-env/ubuntu1804/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu1804/Dockerfile
@@ -50,6 +50,8 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
+ libkrb5-dev \
+ libsasl2-dev \
maven \
flex \
python3-setuptools; \
diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile
b/docker/pegasus-build-env/ubuntu2004/Dockerfile
index 6438fb03b..604b5a0b1 100644
--- a/docker/pegasus-build-env/ubuntu2004/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu2004/Dockerfile
@@ -50,6 +50,8 @@ 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/ubuntu2204/Dockerfile
b/docker/pegasus-build-env/ubuntu2204/Dockerfile
index bab697c78..0eed16c6c 100644
--- a/docker/pegasus-build-env/ubuntu2204/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu2204/Dockerfile
@@ -51,6 +51,8 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
+ libkrb5-dev \
+ libsasl2-dev \
maven \
flex; \
rm -rf /var/lib/apt/lists/*
diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh
index 391f7822f..d80d6437e 100755
--- a/scripts/pack_server.sh
+++ b/scripts/pack_server.sh
@@ -125,8 +125,6 @@ fi
copy_file ./thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/bin
copy_file ./thirdparty/output/lib/libhdfs* ${pack}/bin
-copy_file ./thirdparty/output/lib/libsasl*.so.* ${pack}/bin
-copy_file ./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
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index a0984a2ca..577d9bc6f 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -159,35 +159,6 @@ ExternalProject_Add(thrift
DEPENDS boost
)
-if (NOT APPLE)
- # 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
- )
-endif()
-
check_cxx_compiler_flag(-Wformat-overflow COMPILER_SUPPORTS_FORMAT_OVERFLOW)
if (COMPILER_SUPPORTS_FORMAT_OVERFLOW)
set(ZOOKEEPER_CFLAGS -Wno-error=format-overflow)
@@ -212,9 +183,6 @@ ExternalProject_Add(zookeeper
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
-if (NOT APPLE)
- add_dependencies(zookeeper cyrus-sasl krb5)
-endif ()
ExternalProject_Add(libevent
URL ${OSS_URL_PREFIX}/libevent-release-2.1.8-stable.tar.gz
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
