[Commit-gnuradio] r10492 - in gnuradio/branches/releases/3.2: . gcell/lib/runtime gnuradio-core/src/lib/filter

[jcorgan]

Author: jcorgan
Date: 2009-02-23 16:10:35 -0700 (Mon, 23 Feb 2009)
New Revision: 10492

Modified:
   gnuradio/branches/releases/3.2/configure-cell-cross
   gnuradio/branches/releases/3.2/gcell/lib/runtime/gc_job_manager_impl.cc
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
Log:
Merged r10459:10460, r10480 from trunk into release 3.2 branch

Modified: gnuradio/branches/releases/3.2/configure-cell-cross
===================================================================
--- gnuradio/branches/releases/3.2/configure-cell-cross 2009-02-23 23:07:46 UTC 
(rev 10491)
+++ gnuradio/branches/releases/3.2/configure-cell-cross 2009-02-23 23:10:35 UTC 
(rev 10492)
@@ -33,9 +33,22 @@
 python_version=2.5
 compiler_includes="-isystem ${cell_root}/usr/include"
 
+# check for 4.3 versions of cross-compilers and use them if we've got them
+if which ppu32-gcc43 >/dev/null 2>&1; then
+  ppu32_gcc=ppu32-gcc43
+else
+  ppu32_gcc=ppu32-gcc
+fi
+
+if which ppu32-g++43 >/dev/null 2>&1; then
+  ppu32_gxx=ppu32-g++43
+else
+  ppu32_gxx=ppu32-g++
+fi
+
 $scriptdir/configure                       \
-    CC=${arch}32-gcc                        \
-    CXX=${arch}32-g++                       \
+    CC=${ppu32_gcc}                         \
+    CXX=${ppu32_gxx}                        \
     AR=${arch}-ar                           \
     NM=${arch}-nm                           \
     RANLIB=${arch}-ranlib                   \
@@ -49,6 +62,7 @@
     --with-pythondir=$prefix/lib/python${python_version}/site-packages         
        \
     --disable-gr-video-sdl \
     --disable-gr-audio-portaudio \
+    --disable-gr-audio-jack \
     --disable-usrp2-firmware \
     "$@"
 

Modified: 
gnuradio/branches/releases/3.2/gcell/lib/runtime/gc_job_manager_impl.cc
===================================================================
--- gnuradio/branches/releases/3.2/gcell/lib/runtime/gc_job_manager_impl.cc     
2009-02-23 23:07:46 UTC (rev 10491)
+++ gnuradio/branches/releases/3.2/gcell/lib/runtime/gc_job_manager_impl.cc     
2009-02-23 23:10:35 UTC (rev 10492)
@@ -712,7 +712,7 @@
 pthread_create_failure_msg(int r, const char *which)
 {
   char buf[256];
-  char *s = 0;
+  const char *s = 0;
 
   switch (r){
   case EAGAIN: s = "EAGAIN"; break;

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
   2009-02-23 23:07:46 UTC (rev 10491)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.cc
   2009-02-23 23:10:35 UTC (rev 10492)
@@ -28,6 +28,7 @@
 #include <gr_math.h>
 #include <gr_altivec.h>
 #include <dotprod_fff_altivec.h>
+#include <string.h>
 #include "posix_memalign.h"
 
 gr_fir_fff_altivec::gr_fir_fff_altivec()