Skip to content

Adjusted ci scripts to build deps to /tmp and support removal of packages installed by dependencies.sh #5953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Adjusted ci scripts to build deps to /tmp and support removal of packages installed by dependencies.sh #5953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ci/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@ if [ -n "$TERMUX_VERSION" ]; then
OPTS="$OPTS --without-pam"
fi

if [ -d /tmp/liblmdb ]; then
OPTS="$OPTS --with-lmdb=/tmp/liblmdb"
fi
if [ -d /tmp/librsync ]; then
OPTS="$OPTS --with-librsync=/tmp/librsync"
fi

./autogen.sh $OPTS
11 changes: 9 additions & 2 deletions ci/dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# dependencies.sh is called by install.sh to install libraries and packages needed to build and install CFEngine from source.
set -ex

if [ "$1" = "--remove" ]; then
remove=yes
else
remove=no
fi


GAINROOT=""
if [ "$(id -u)" != "0" ]; then
GAINROOT="sudo"
Expand All @@ -23,7 +30,7 @@ build_lmdb() {
git clone --recursive --depth 1 https://github.com/LMDB/lmdb
cd lmdb/libraries/liblmdb
make
$GAINROOT make install prefix=/usr
$GAINROOT make install prefix=/tmp/liblmdb
)
}

Expand All @@ -34,7 +41,7 @@ build_librsync() {
cd "$tmpdir"
git clone --recursive --depth 1 https://github.com/librsync/librsync
cd librsync
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
cmake -DCMAKE_INSTALL_PREFIX=/tmp/librsync -DCMAKE_BUILD_TYPE=Release .
make
$GAINROOT make install
)
Expand Down
Loading