Merge pull request #14 from gizmoguy/debian-packaging

Work-around for libzstd-dev not being available for debian jessie.
LibtraceTeam · Jul 3, 2018 · 748934a · 748934a
2 parents 19449ba + de2f8bb
commit 748934a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/debian/control b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Brad Cowie <brad@wand.net.nz>
 Build-Depends: debhelper (>= 9), dh-autoreconf,
  zlib1g-dev, liblzma-dev, libbz2-dev,
- liblzo2-dev,  libcurl4-openssl-dev, libzstd-dev
+ liblzo2-dev,  libcurl4-openssl-dev
 Standards-Version: 4.1.3
 Section: libs
 Homepage: http://research.wand.net.nz/software/libwandio.php

diff --git a/gitlab-build.sh b/gitlab-build.sh
@@ -11,6 +11,9 @@ apt-get install -y equivs devscripts dpkg-dev quilt curl apt-transport-https \
     apt-utils ssl-cert ca-certificates gnupg lsb-release debhelper git
 apt-get upgrade -y
 
+# Install libzstd-dev if available for optional zstd support
+apt-get install -y libzstd-dev || true
+
 debchange --newversion ${CI_COMMIT_REF_NAME} -b "New upstream release"
 mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
 dpkg-buildpackage -b -us -uc -rfakeroot -j4