Skip to content

Commit

Permalink
gcc instead of broken clang on s390x
Browse files Browse the repository at this point in the history
  • Loading branch information
akostadinov committed Nov 6, 2023
1 parent 5c3d888 commit 4b2c4f9
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
FROM quay.io/centos/centos:stream9 AS builder
ENV SEARCHD_REF=6.2.12 \
SEARCHD_REPO=https://github.com/manticoresoftware/manticoresearch.git \
CC=clang-16 \
CXX=clang++-16 \
BUILD_PATH=/tmp/manticore_uselessly_long_path_to_prevent_rpm_build_issues \
BUILD_FLAGS="-DUSE_SYSLOG=0 -DWITH_GALERA=0 -DWITH_RE2=0 -DWITH_STEMMER=0 -DWITH_ICU=1 -DWITH_SSL=1 -DWITH_ZLIB=1 -DWITH_ODBC=0 -DWITH_EXPAT=0 -DWITH_ICONV=1 -DWITH_POSTGRESQL=0 -DWITH_MYSQL=0 -DBUILD_TESTING=0"
WORKDIR $BUILD_PATH

SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
# hadolint ignore=DL3003,DL3032,SC2046
RUN yum install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs llvm-toolset mysql cmake boost-devel openssl-devel zlib-devel bison flex systemd-units rpm-build git && \
RUN yum install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs make automake gcc gcc-c++ kernel-devel mysql cmake boost-devel openssl-devel zlib-devel bison flex systemd-units rpm-build git && \
git clone --depth=1 --branch=$SEARCHD_REF $SEARCHD_REPO . && \
sed -i -e 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' src/CMakeLists.txt && \
mkdir build && cd build && \
clang-16 --version && clang++-16 --version && \
cmake $BUILD_FLAGS .. && \
cmake --build . --target package --config RelWithDebInfo

Expand Down

0 comments on commit 4b2c4f9

Please sign in to comment.