From abb70ac7d26c70d52e83438eb30bdf5d1b64eec8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 20 Apr 2012 12:11:32 -0700
Subject: cmake: fix compiler flags on ppc arch

---
 gnuradio-core/src/lib/filter/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnuradio-core/src/lib')

diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt
index d26e55fb8..6a152524e 100644
--- a/gnuradio-core/src/lib/filter/CMakeLists.txt
+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt
@@ -195,6 +195,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL "
         ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx.S
     )
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        add_definitions(-maltivec)
+    endif()
     list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_powerpc.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_powerpc.cc
-- 
cgit 


From 8e8335e2e4f20e3015956b30f05013913cb3fc54 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sat, 21 Apr 2012 09:05:56 -0700
Subject: core: add SWIG macro for namespaced blocks

---
 gnuradio-core/src/lib/swig/gnuradio.i            |  3 +++
 gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'gnuradio-core/src/lib')

diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i
index 239223851..3a421ad5d 100644
--- a/gnuradio-core/src/lib/swig/gnuradio.i
+++ b/gnuradio-core/src/lib/swig/gnuradio.i
@@ -20,6 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// Disable warning about base class types
+#pragma SWIG nowarn=401
+
 ////////////////////////////////////////////////////////////////////////
 // gnuradio.i
 // SWIG interface definition
diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
index cdc9fbe49..4016ae772 100644
--- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
+++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2010,2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -40,3 +40,11 @@ FULL_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(),
 %}
 %enddef
 #endif
+
+%define GR_SWIG_BLOCK_MAGIC2(PKG, BASE_NAME)
+%template(BASE_NAME ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>;
+%pythoncode %{
+BASE_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id())
+BASE_NAME = BASE_NAME.make;
+%}
+%enddef
-- 
cgit