Permalink
Browse files

Merge pull request #9 from ssinyagin/master

Tested on a pristine Debian and fixed broken dependencies
  • Loading branch information...
oetiker committed Mar 25, 2012
2 parents 26b4b00 + 0d5d11e commit 07b41f4860a227ed61fe99e4fe4eecc757a9d815
Showing with 46 additions and 22 deletions.
  1. 0 build_perl-5.14.2.sh
  2. +36 −16 build_rrdtool-1.4.5.sh
  3. +4 −6 build_torrus_deps.sh
  4. +6 −0 sdbs.inc
View
0 build_perl-5.14.2.sh 100644 → 100755
No changes.
View
@@ -2,36 +2,56 @@
. `dirname $0`/sdbs.inc
-if prepare http://zlib.net/ zlib-1.2.5.tar.gz; then
+if [ x`which pkg-config` = x ]; then
+ echo "Cannot find pkg-config in PATH. Aborting."
+ exit 1
+fi
+
+# make our own zlib.
+# Other packages do not use pkg-config for finding zlib, so we
+# have to set LDFLAGS and CPPFLAGS explicitly
+if prepare http://switch.dl.sourceforge.net/project/libpng/zlib/1.2.5/ \
+ zlib-1.2.5.tar.gz; then
CFLAGS="-O3 -fPIC" ./configure --prefix=$PREFIX
CFLAGS="-O3 -fPIC" make install
touch $WORKDIR/zlib-1.2.5.tar.gz.ok
fi
-simplebuild http://ftp.gnu.org/pub/gnu/gettext/ gettext-0.18.1.1.tar.gz CFLAGS="-O3 -fPIC" \
- --disable-java
+simplebuild http://ftp.gnu.org/pub/gnu/gettext/ gettext-0.18.1.1.tar.gz \
+ CFLAGS="-O3 -fPIC" --disable-java
+
+simplebuild http://xmlsoft.org/sources/ libxml2-2.7.8.tar.gz --without-python
-simplebuild ftp://xmlsoft.org/libxml2/ libxml2-2.7.8.tar.gz --without-python
+simplebuild \
+http://switch.dl.sourceforge.net/project/libpng/libpng14/older-releases/1.4.9/ \
+libpng-1.4.9.tar.gz CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
-simplebuild ftp://ftp.simplesystems.org/pub/libpng/png/src/ libpng-1.4.8.tar.gz
+simplebuild http://switch.dl.sourceforge.net/project/expat/expat/2.0.1/ \
+ expat-2.0.1.tar.gz
-simplebuild http://download.savannah.gnu.org/releases/freetype/ freetype-2.4.6.tar.gz \
- CFLAGS="-O3 -fPIC"
+simplebuild http://download.savannah.gnu.org/releases/freetype/ \
+ freetype-2.4.6.tar.gz CFLAGS="-O3 -fPIC"
-simplebuild http://www.freedesktop.org/software/fontconfig/release/ fontconfig-2.8.0.tar.gz \
- CFLAGS="-O3 -fPIC"
+simplebuild http://www.freedesktop.org/software/fontconfig/release/ \
+ fontconfig-2.8.0.tar.gz CFLAGS="-O3 -fPIC"
-simplebuild http://cairographics.org/releases/ pixman-0.22.2.tar.gz CFLAGS="-O3 -fPIC" \
- --disable-static-testprogs \
- --disable-gtk
+simplebuild http://cairographics.org/releases/ pixman-0.22.2.tar.gz \
+ CFLAGS="-O3 -fPIC" \
+ --disable-static-testprogs \
+ --disable-gtk
simplebuild http://cairographics.org/releases/ cairo-1.10.2.tar.gz \
- --enable-xlib=no --enable-xlib-render=no --enable-win32=no CFLAGS="-O3 -fPIC"
+ --enable-xlib=no --enable-xlib-render=no --enable-win32=no \
+ CFLAGS="-O3 -fPIC" CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
-simplebuild http://ftp.gnome.org/pub/gnome/sources/glib/2.28/ glib-2.28.7.tar.gz CFLAGS="-O3 -fPIC"
+simplebuild http://ftp.gnome.org/pub/gnome/sources/glib/2.28/ \
+ glib-2.28.7.tar.gz CFLAGS="-O3 -fPIC" \
+ CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
-simplebuild http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/ pango-1.28.4.tar.gz --without-x CFLAGS="-O3 -fPIC"
+simplebuild http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/ \
+ pango-1.28.4.tar.gz --without-x CFLAGS="-O3 -fPIC"
-simplebuild http://oss.oetiker.ch/rrdtool/pub/ rrdtool-1.4.5.tar.gz --with-perl-options="PREFIX=$PREFIX LIB=$PREFIX/lib/perl5"
+simplebuild http://oss.oetiker.ch/rrdtool/pub/ rrdtool-1.4.5.tar.gz \
+ --with-perl-options="PREFIX=$PREFIX LIB=$PREFIX/lib/perl5"
View
@@ -2,16 +2,14 @@
. `dirname $0`/sdbs.inc
-echo "you may ./build_perl-5.12.4.sh to get a recent version of perl up"
-echo "5.14.1 does not work because FCGI-0.69 does not build"
-echo "until https://rt.cpan.org/Public/Bug/Display.html?id=68380 if fixed we are stuck"
+echo "Required prerequisites (recommended to build with SDBS): "
+echo " perl 5.12.4 or 5.14.2"
+echo " rrdtool 1.4.5 or higher"
sleep 3
export PATH=$PREFIX/bin:$PATH
-simplebuild ftp://xmlsoft.org/libxml2/ libxml2-2.7.8.tar.gz --without-python
-
if prepare http://download.oracle.com/berkeley-db/ db-4.8.30.tar.gz ; then
cd build_unix
../dist/configure \
@@ -40,7 +38,7 @@ for module in \
JSON::XS \
JSON \
CGI::Fast \
- MSTROUT/FCGI-0.69.tar.gz \
+ FCGI \
; do
perlmodule $module
done
View
@@ -5,6 +5,12 @@ set +o hashall
## do not tolerate unset variables
set -u
+## check if wget is available
+if [ x`which wget` = x ]; then
+ echo "cannot find wget in PATH. Aborting"
+ exit 1
+fi
+
PREFIX=${1:-${PREFIX:-""}}
if [ ${PREFIX:-""} = "" ]; then

0 comments on commit 07b41f4

Please sign in to comment.