From dd16c691623f6f312af238ecb366ffc74db4d35b Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Thu, 4 Oct 2018 11:09:58 +0200 Subject: [PATCH] prepare for python3 --- python/__init__.py | 31 ------------------------------- swig/CMakeLists.txt | 4 ---- 2 files changed, 35 deletions(-) diff --git a/python/__init__.py b/python/__init__.py index 1ce4a83..04269d6 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -16,40 +16,9 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# The presence of this file turns this directory into a Python package - -''' -This is the GNU Radio CCS module. Place your Python package -description here (python/__init__.py). -''' - -# ---------------------------------------------------------------- -# Temporary workaround for ticket:181 (swig+python problem) -import sys -_RTLD_GLOBAL = 0 -try: - from dl import RTLD_GLOBAL as _RTLD_GLOBAL -except ImportError: - try: - from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL - except ImportError: - pass - -if _RTLD_GLOBAL != 0: - _dlopenflags = sys.getdlopenflags() - sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL) -# ---------------------------------------------------------------- - - # import swig generated symbols into the foo namespace from foo_swig import * from selector import * # import any pure python here # - -# ---------------------------------------------------------------- -# Tail of workaround -if _RTLD_GLOBAL != 0: - sys.setdlopenflags(_dlopenflags) # Restore original flags -# ---------------------------------------------------------------- diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 4fa2be2..77c19c6 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -21,10 +21,6 @@ # Include swig generation macros ######################################################################## find_package(SWIG) -find_package(PythonLibs 2) -if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) - return() -endif() include(GrSwig) include(GrPython)