Skip to content

Commit

Permalink
Merge pull request #726 from KrisThielemans/apt_fixes
Browse files Browse the repository at this point in the history
Apt fixes
  • Loading branch information
KrisThielemans authored Jun 17, 2022
2 parents b918a81 + 16ed9c8 commit c19d134
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions docker/build_system-ubuntu.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
set -ev
set -e
# SIRF external dependencies
add-apt-repository -y universe # needed for hdf5 for instance
apt-get update -qq
APT_GET_INSTALL="apt-get install -yq --no-install-recommends"

# echo "Installing boost 1.65 or later"
# first find current boost version (if any)
# the 'tail' makes sure we use the last one listed by apt-cache in case there is more than 1 version
function find_boost_version() {
tmp=$(apt-cache search libboost|grep ALL|egrep libboost[1-9]|tail -n 1)
tmp=$(apt-cache search libboost|egrep 'libboost[1-9].*-dev'|tail -n 1)
boost_major=${tmp:8:1}
boost_minor=${tmp:10:2}
}
Expand All @@ -29,6 +29,9 @@ else
# packaged boost is too old
# we need to find a ppa that has it. This is unsafe and likely prone to falling over
# when the ppa is no longer maintained
echo "Please submit a PR with a recent PPA for boost for your OS."
exit 1
# the mhier PPA is no longer supported
echo "trying to find boost from ppa:mhier/libboost-latest"
${APT_GET_INSTALL} software-properties-common
$SUDO add-apt-repository -y ppa:mhier/libboost-latest
Expand Down

0 comments on commit c19d134

Please sign in to comment.