Use parallel make and adjust to accommodate new glib unversioned library names.

Tue, 28 Aug 2012 19:02:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 19:02:00 +0200
changeset 630
561e962f5a6e
parent 629
27f852b7efd2
child 631
08b1736686fa

Use parallel make and adjust to accommodate new glib unversioned library names.

rrdtool/rrdtool.patch file | annotate | diff | comparison | revisions
rrdtool/rrdtool.spec file | annotate | diff | comparison | revisions
     1.1 --- a/rrdtool/rrdtool.patch	Tue Aug 28 19:00:50 2012 +0200
     1.2 +++ b/rrdtool/rrdtool.patch	Tue Aug 28 19:02:00 2012 +0200
     1.3 @@ -116,7 +116,7 @@
     1.4  -	} else {
     1.5  -		$librrd = "-L../../src/.libs/ $R -lrrd";
     1.6  -	}
     1.7 -+    my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lcairo -lpangocairo -lpixman-1 -lpango -lpangoft2 -lfreetype -lpng -lgobject2 -lgio2 -lgmodule2 -lglib2 -lfontconfig -lfreetype -lxml2 -lexpat -lpcre -lz -liconv -lintl";
     1.8 ++    my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lcairo -lpangocairo -lpixman-1 -lpango -lpangoft2 -lfreetype -lpng -lgobject -lgio -lgmodule -lglib -lfontconfig -lfreetype -lxml2 -lexpat -lpcre -lz -liconv -lintl";
     1.9   
    1.10   	WriteMakefile(
    1.11   		'NAME'         => 'RRDs',
     2.1 --- a/rrdtool/rrdtool.spec	Tue Aug 28 19:00:50 2012 +0200
     2.2 +++ b/rrdtool/rrdtool.spec	Tue Aug 28 19:02:00 2012 +0200
     2.3 @@ -136,7 +136,7 @@
     2.4          --enable-rrdcgi
     2.5  
     2.6      #   build package
     2.7 -    %{l_make} %{l_mflags}
     2.8 +    %{l_make} %{l_mflags -O}
     2.9  
    2.10      #   build Perl part
    2.11  %if "%{with_perl}" == "yes"

mercurial