Skip to content

Commit

Permalink
Adjust Dockerfile for ubuntu noble (#272)
Browse files Browse the repository at this point in the history
Use DBOOST_TIMER_ENABLE_DEPRECATED to correct deprecation error.

Use Boost_ROOT to correctly specify cmake path.

Also remove outdated python3-distutils package.

---------

Co-authored-by: Edward J. Schwartz <edmcman@cmu.edu>
  • Loading branch information
sei-eschwartz and edmcman committed Apr 27, 2024
1 parent 98d591c commit 1d695a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV CXXFLAGS="$CXXFLAGS"
# This will make a smaller, non-development Dockerfile by default
ARG RECLAIM="-reclaim"

RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install sudo build-essential wget flex ghostscript bzip2 git subversion automake libtool bison python3 python3-distutils libncurses-dev vim-common sqlite3 libsqlite3-0 libsqlite3-dev zlib1g-dev cmake ninja-build libyaml-cpp-dev libboost-dev libboost-chrono-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-random-dev libboost-regex-dev libboost-system-dev libboost-wave-dev libboost-thread-dev libboost-timer-dev libxml2-dev && rm -rf /var/lib/apt/lists/*
RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install sudo build-essential wget flex ghostscript bzip2 git subversion automake libtool bison python3 python3-setuptools libncurses-dev vim-common sqlite3 libsqlite3-0 libsqlite3-dev zlib1g-dev cmake ninja-build libyaml-cpp-dev libboost-dev libboost-chrono-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-random-dev libboost-regex-dev libboost-system-dev libboost-wave-dev libboost-thread-dev libboost-timer-dev libxml2-dev && rm -rf /var/lib/apt/lists/*

# Only add the build prerequisites script so they won't be rebuilt on pharos code change
RUN mkdir -p /root/pharos/scripts/
Expand Down
3 changes: 2 additions & 1 deletion scripts/build_prereqs.bash
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ mkdir ../rose-build
cd ../rose-build

sudo ldconfig
cmake -GNinja -DCMAKE_INSTALL_PREFIX=$PREFIX -DBOOST_ROOT=$PREFIX -DZ3_ROOT=$PREFIX \
env CXXFLAGS="$CXXFLAGS -DBOOST_TIMER_ENABLE_DEPRECATED" \
cmake -GNinja -DCMAKE_INSTALL_PREFIX=$PREFIX -DBoost_ROOT=$PREFIX -DZ3_ROOT=$PREFIX \
-Denable-binary-analysis=yes -Denable-c=no -Denable-opencl=no -Denable-java=no -Denable-php=no \
-Denable-fortran=no -Ddisable-tutorial-directory=yes -Denable-projects-directory=no \
-Ddisable-tests-directory=yes ../rose
Expand Down

0 comments on commit 1d695a1

Please sign in to comment.