Skip to content

Commit

Permalink
1.1.2 (#93)
Browse files Browse the repository at this point in the history
  • Loading branch information
bigerl committed Jul 26, 2022
1 parent ee1e0a6 commit 9ff31e2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.13)
project(tentris
LANGUAGES CXX
VERSION 1.1.0)
VERSION 1.1.2)
set(CMAKE_CXX_STANDARD 20)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/tentris/tentris_version.hpp)
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ubuntu:groovy AS builder
FROM ubuntu:22.04 AS builder
ARG DEBIAN_FRONTEND=noninteractive
ARG TENTRIS_MARCH="x86-64"

RUN apt-get -qq update && \
apt-get -qq install -y make cmake uuid-dev git openjdk-11-jdk python3-pip python3-setuptools python3-wheel libstdc++-10-dev clang-11 g++-10 pkg-config lld autoconf libtool
RUN rm /usr/bin/ld && ln -s /usr/bin/lld-11 /usr/bin/ld
ARG CXX="clang++-11"
ARG CC="clang-11"
apt-get -qq install -y make cmake uuid-dev git openjdk-11-jdk python3-pip python3-setuptools python3-wheel libstdc++-11-dev clang-14 g++-11 pkg-config lld autoconf libtool
RUN rm /usr/bin/ld && ln -s /usr/bin/lld-14 /usr/bin/ld
ARG CXX="clang++-14"
ARG CC="clang-14"
ENV CXXFLAGS="${CXXFLAGS} -march=${TENTRIS_MARCH}"
ENV CMAKE_EXE_LINKER_FLAGS="-L/usr/local/lib/x86_64-linux-gnu -L/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib"

# Compile more recent tcmalloc-minimal with clang-11 + -march
# Compile more recent tcmalloc-minimal with clang-14 + -march
RUN git clone --quiet --branch gperftools-2.8.1 https://github.com/gperftools/gperftools
WORKDIR /gperftools
RUN ./autogen.sh
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
boost/1.75.0
fmt/7.1.3
restinio/0.6.12
hypertrie/0.6.0@dice-group/stable
hypertrie/0.6.1@dice-group/stable
rdf-parser/0.13.0@dice-group/stable
sparql-parser-base/0.2.2@dice-group/stable

Expand Down

0 comments on commit 9ff31e2

Please sign in to comment.