Skip to content

Commit

Permalink
Merge pull request #17 from camptocamp/build_fix
Browse files Browse the repository at this point in the history
Install libgd-dev instead of libgd2-xpm-dev
  • Loading branch information
fredj authored May 14, 2018
2 parents 4237262 + 21640bd commit b5d4ba2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:18.04
MAINTAINER Camptocamp<[email protected]>

RUN apt-get -y update && \
LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y bison flex python-lxml libfribidi-dev swig cmake librsvg2-dev colordiff libpq-dev libpng-dev libjpeg-dev libgif-dev libgeos-dev libgd2-xpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal-dev libproj-dev libxml2-dev libxslt1-dev python-dev php-dev libexempi-dev lcov lftp libgdal-dev ninja-build git curl ccache clang libprotobuf-c-dev protobuf-c-compiler
LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y bison flex python-lxml libfribidi-dev swig cmake librsvg2-dev colordiff libpq-dev libpng-dev libjpeg-dev libgif-dev libgeos-dev libgd-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal-dev libproj-dev libxml2-dev libxslt1-dev python-dev php-dev libexempi-dev lcov lftp libgdal-dev ninja-build git curl ccache clang libprotobuf-c-dev protobuf-c-compiler libharfbuzz-dev

RUN curl -L "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" > /usr/bin/gosu && \
chmod a+x /usr/bin/gosu
Expand Down
11 changes: 0 additions & 11 deletions builder/build.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
#!/bin/bash
set -e

if ! [ -d /build/harfbuzz ]
then
cd /build
curl -L http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.38.tar.bz2 | tar xjf -
mv harfbuzz* harfbuzz
fi

cd /build/harfbuzz
./configure --without-cairo --without-glib --without-icu --prefix=/usr/local
make -j4 install

cd /build

export CXX="/usr/lib/ccache/clang++"
Expand Down

0 comments on commit b5d4ba2

Please sign in to comment.