Skip to content

Commit d36d2e6

Browse files
Alexey Pleshakovqrort
authored andcommitted
Fix C_INCLUDE paths, added libssl 1.0 to dependencies
1 parent 0e73cd0 commit d36d2e6

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

.github/workflows/publish-utbot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish UTBot as an archive
22

33
on:
44
push:
5-
branches: [main]
5+
# branches: [main]
66

77
jobs:
88
publish:

docker/Dockerfile_base

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ RUN echo "StrictHostKeyChecking no" >> /home/utbot/.ssh/config
127127

128128
USER root
129129
ARG OPERATING_SYSTEM_TAG
130+
131+
# When we switch to Ubuntu 20 container, we may still need old libssl if we support Ubuntu < 18
132+
# RUN "deb http://security.ubuntu.com/ubuntu bionic-security main" | sudo tee -a /etc/apt/sources.list
133+
# RUN apt update && apt-cache policy libssl1.0-dev
134+
# RUN apt install -y --no-install-recommends libssl1.0-dev
135+
130136
RUN if [[ "$OPERATING_SYSTEM_TAG" = "18.04" ]] ; then apt update && apt install -y --no-install-recommends nodejs-dev node-gyp libssl1.0-dev ; fi
131137
RUN apt update && apt install -y --no-install-recommends nodejs npm openssh-server net-tools gdb vim-nox rsync
132138
RUN pip3 install git+https://chromium.googlesource.com/external/gyp

docker/building_dependencies/install_packages/debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ shopt -s expand_aliases
1616
# A grep command which clears out the output of apt-rdepends
1717
alias grepdepends='grep -v "^ " | grep -v "^libc-dev$" | grep -v "^debconf-2.0$" | grep -v "^libc6$" | grep -v "^libunwind8-dev$" | grep -v "^awk$"'
1818
# Get all the dependencies of utbot
19-
apt-rdepends libsqlite3-dev libgoogle-perftools-dev libssl-dev python3-pip gzip make gcc-9 g++-9 | grepdepends > all.txt
19+
apt-rdepends libsqlite3-dev libgoogle-perftools-dev libssl-dev libssl1.0-dev python3-pip gzip make gcc-9 g++-9 | grepdepends > all.txt
2020
# Get all the dependencies of libc6-dev
2121
apt-rdepends libc6-dev | grepdepends > debian-libc-dev.txt
2222
# Get all the dependencies of utbot except all the dependencies of libc6-dev

docker/release_distribution_scripts/utbot_run_system.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export UTBOT_ALL=$CURRENT_FOLDER
2424
export UTBOT_INSTALL_DIR=$UTBOT_ALL/install
2525
export CC=$UTBOT_ALL/debs-install/usr/bin/gcc-9
2626
export CXX=$UTBOT_ALL/debs-install/usr/bin/g++-9
27-
export CPATH=$CPATH:$UTBOT_ALL/klee/include # Path for C and C++ includes
27+
export CPATH=$UTBOT_ALL/klee/include:$CPATH # Path for C and C++ includes
2828
export PATH=$UTBOT_ALL/bear/bin:$UTBOT_ALL/klee/bin:$UTBOT_INSTALL_DIR/bin:$PATH
2929
export KLEE_RUNTIME_LIBRARY_PATH=$UTBOT_ALL/klee/lib/klee/runtime/
3030

@@ -34,8 +34,8 @@ IS_SUSE="$(grep '^NAME=' /etc/os-release | tr '[:upper:]' '[:lower:]' | grep sus
3434
# Setting environment variables for debian packages
3535
export PATH=$UTBOT_ALL/debs-install/usr/bin:$PATH
3636
export LD_LIBRARY_PATH=$UTBOT_ALL/debs-install/usr/lib/x86_64-linux-gnu:$UTBOT_ALL/debs-install/lib/x86_64-linux-gnu:$UTBOT_ALL/debs-install/usr/lib:$UTBOT_ALL/install/lib
37-
export CPATH=$CPATH:$UTBOT_ALL/debs-install/usr/include:$UTBOT_ALL/debs-install/usr/include/x86_64-linux-gnu/
38-
export C_INCLUDE_PATH=$C_INCLUDE_PATH:$UTBOT_ALL/debs-install/usr/include:$UTBOT_ALL/debs-install/usr/lib/gcc/x86_64-linux-gnu/9/include/
37+
export CPATH=$UTBOT_ALL/debs-install/usr/include:$UTBOT_ALL/debs-install/usr/include/x86_64-linux-gnu/:$CPATH
38+
export C_INCLUDE_PATH=$UTBOT_ALL/debs-install/usr/include:$UTBOT_ALL/debs-install/usr/lib/gcc/x86_64-linux-gnu/9/include/:$C_INCLUDE_PATH
3939
export CPLUS_INCLUDE_PATH=$UTBOT_ALL/debs-install/usr/include/c++/9:$UTBOT_ALL/debs-install/usr/include/x86_64-linux-gnu/c++/9:$UTBOT_ALL/debs-install/usr/include/c++/9/backward:$UTBOT_ALL/debs-install/usr/include
4040
export LDFLAGS="-fuse-ld=gold -B $UTBOT_ALL/debs-install/usr/lib/gcc/x86_64-linux-gnu/9/ -L $UTBOT_ALL/debs-install/usr/lib/gcc/x86_64-linux-gnu/9/ -B $UTBOT_ALL/debs-install/usr/lib/x86_64-linux-gnu/ -L $UTBOT_ALL/debs-install/usr/lib/x86_64-linux-gnu/ -L$UTBOT_ALL/debs-install/usr/lib64/ -B $UTBOT_ALL/debs-install/usr/lib64/ -L /lib64/ -B /lib64/" # Paths for object files and libraries with which compiler should link the project
4141
# This function moves dev version of libc into $UTBOT_ALL/debs-install directory

0 commit comments

Comments
 (0)