summaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2018-05-08 14:17:29 -0700
committerDimitri John Ledkov <xnox@ubuntu.com>2018-05-08 14:17:29 -0700
commitd00c9550da1801a0eaff5cedf4312e24691b31ea (patch)
tree3881ca1764ef792259e1b70f12c884a3ac0c0715 /travis
parentdab6d2181f1f194ec3a76d900cf2c6533379cbea (diff)
New upstream release.
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/build-dep-reiserfs18
-rwxr-xr-xtravis/build-dep-zstd18
-rw-r--r--travis/images/ci-musl-x86_64/Dockerfile3
3 files changed, 34 insertions, 5 deletions
diff --git a/travis/build-dep-reiserfs b/travis/build-dep-reiserfs
index b32b8058..72308ef2 100755
--- a/travis/build-dep-reiserfs
+++ b/travis/build-dep-reiserfs
@@ -2,14 +2,28 @@
# download, build and install reiserfs library
version=3.6.27
+dir=tmp-cached-reiser
+stamp="$dir/.last-build-reiser"
+here=`pwd`
set -e
-mkdir tmp-reiser
-cd tmp-reiser
+if [ -d "$dir" -a -f "$stamp" ]; then
+ echo "Using valid cache for $dir, built" `cat "$stamp"`
+ cd "$dir"
+ cd reiserfsprogs-${version}
+ sudo make install
+ exit 0
+fi
+
+echo "No or stale cache for $dir, rebuilding"
+rm -rf "$dir"
+mkdir "$dir"
+cd "$dir"
wget https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/reiserfsprogs-${version}.tar.xz
tar xf reiserfsprogs-${version}.tar.xz
cd reiserfsprogs-${version}
./configure --prefix=/usr
make all
sudo make install
+date > "$here/$stamp"
diff --git a/travis/build-dep-zstd b/travis/build-dep-zstd
index 22369dd3..eae0be63 100755
--- a/travis/build-dep-zstd
+++ b/travis/build-dep-zstd
@@ -2,13 +2,27 @@
# download, build and install the zstd library
version=1.3.3
+dir=tmp-cached-zstd
+stamp="$dir/.last-build-zstd"
+here=`pwd`
set -e
-mkdir tmp-zstd
-cd tmp-zstd
+if [ -d "$dir" -a -f "$stamp" ]; then
+ echo "Using valid cache for $dir, built" `cat "$stamp"`
+ cd "$dir"
+ cd zstd-${version}
+ sudo make install PREFIX=/usr
+ exit 0
+fi
+
+echo "No or stale cache for $dir, rebuilding"
+rm -rf "$dir"
+mkdir "$dir"
+cd "$dir"
wget https://github.com/facebook/zstd/archive/v${version}.tar.gz
tar xf v${version}.tar.gz
cd zstd-${version}
make
sudo make install PREFIX=/usr
+date > "$here/$stamp"
diff --git a/travis/images/ci-musl-x86_64/Dockerfile b/travis/images/ci-musl-x86_64/Dockerfile
index dbbe4dc1..15d59451 100644
--- a/travis/images/ci-musl-x86_64/Dockerfile
+++ b/travis/images/ci-musl-x86_64/Dockerfile
@@ -5,6 +5,7 @@ WORKDIR /tmp
RUN apk update
RUN apk add linux-headers musl-dev util-linux-dev bash
RUN apk add attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev zstd-dev
-RUN apk add autoconf automake make gcc tar gzip
+RUN apk add autoconf automake make gcc tar gzip clang
+RUN apk add python3 py3-setuptools python3-dev
COPY ./test-build .