Revision: 48594
Author:   river
Date:     2009-03-19 19:08:58 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
TSganglia: update to current build system

Modified Paths:
--------------
    trunk/tools/ts-specs/TSganglia.spec

Modified: trunk/tools/ts-specs/TSganglia.spec
===================================================================
--- trunk/tools/ts-specs/TSganglia.spec 2009-03-19 19:08:01 UTC (rev 48593)
+++ trunk/tools/ts-specs/TSganglia.spec 2009-03-19 19:08:58 UTC (rev 48594)
@@ -18,7 +18,9 @@
 
 Requires: SUNWgccruntime
 Requires: TSlibconfuse
+Requires: TSrrdtool
 BuildRequires: TSlibconfuse-devel
+BuildRequires: TSrrdtool-devel
 
 %package root
 Summary:               %{summary} - / filesystem
@@ -48,23 +50,23 @@
 
 %build
 
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-     CPUS=1
-fi
-
 %include stdenv.inc
 CFLAGS="$CFLAGS -std=c99"
-%_configure --with-gmetad
+%_configure                                    \
+       --with-gmetad                           \
+       --with-librrd=/opt/ts                   \
+       --with-libexpat=/opt/ts                 \
+       --with-libconfuse=/opt/ts               \
+       --with-libapr=/opt/ts/bin/apr-1-config
+        
 
-gmake -j$CPUS
+%_make -j$CPUS
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %include stdenv.inc
+%_make install DESTDIR=$RPM_BUILD_ROOT
 
-gmake install DESTDIR=$RPM_BUILD_ROOT
-
 rm ${RPM_BUILD_ROOT}%{_libdir}/libganglia.la
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ganglia



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to