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

Jump to bottom

Revert "build(thirdparty): add thirdparty for centos6 build env (#1017)" #1600

Merged
merged 6 commits into from
Sep 10, 2023
Merged

Revert "build(thirdparty): add thirdparty for centos6 build env (#1017)" #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8aff46e
Revert "build(thirdparty): add thirdparty for centos6 build env (#10…
acelyc111 Sep 7, 2023
7ac5728
push master images
acelyc111 Sep 8, 2023
cb44361
run ASAN in Ubuntu 2204
acelyc111 Sep 8, 2023
c877409
revert
acelyc111 Sep 8, 2023
4d25b04
1804
acelyc111 Sep 8, 2023
53996ca
1804
acelyc111 Sep 8, 2023
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: 1 addition & 1 deletion .github/workflows/thirdparty-regular-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
fail-fast: false
matrix:
osversion:
- ubuntu2204
- ubuntu1804
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
Expand Down
2 changes: 2 additions & 0 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,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;
Expand Down
2 changes: 2 additions & 0 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,6 +50,8 @@ RUN apt-get update -y; \
libtool \
libssl-dev \
bison \
libkrb5-dev \
libsasl2-dev \
maven \
flex \
python3-setuptools; \
Expand Down
2 changes: 2 additions & 0 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,6 +50,8 @@ 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: 2 additions & 0 deletions docker/pegasus-build-env/ubuntu2204/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
2 changes: 0 additions & 2 deletions scripts/pack_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 0 additions & 32 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading