diff -r 84a9f800fa37 -r 1e46ce84435a rrdtool/rrdtool.spec --- a/rrdtool/rrdtool.spec Thu Oct 04 20:00:55 2012 +0200 +++ b/rrdtool/rrdtool.spec Thu Oct 04 20:04:22 2012 +0200 @@ -54,11 +54,11 @@ # build information BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool PreReq: OpenPKG, openpkg >= 20100101 -BuildPreReq: png, zlib, freetype, pango, cairo, libxml -PreReq: png, zlib, freetype, pango, cairo, libxml +BuildPreReq: png, zlib, freetype, pango, cairo, libpixman, libxml, libffi +PreReq: png, zlib, freetype, pango, cairo, libpixman, libxml, libffi %if "%{with_perl}" == "yes" -BuildPreReq: perl -PreReq: perl +BuildPreReq: perl, libpixman::with_pic = yes +PreReq: perl, libpixman::with_pic = yes %endif %if "%{with_python}" == "yes" BuildPreReq: python @@ -117,8 +117,13 @@ echo "ac_cv_path_PERL=no" >config.cache CC="%{l_cc}" \ CPPFLAGS="%{l_cppflags}" \ +%if "%{with_perl}" == "yes" + CFLAGS="%{l_cflags -O} -fPIC" \ + LDLAGS="%{l_ldflags} -fPIC" \ +%else CFLAGS="%{l_cflags -O}" \ LDLAGS="%{l_ldflags}" \ +%endif LIBS="`pkg-config pangocairo --libs`" \ ./configure \ --cache-file=./config.cache \ @@ -155,7 +160,7 @@ -e 's/^\(install-data-am:\).*/\1/' \ Makefile %{l_make} %{l_mflags} install \ - DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" # install Perl part %if "%{with_perl}" == "yes"