prepare for python3
This commit is contained in:
@@ -16,40 +16,9 @@
|
|||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 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
|
# import swig generated symbols into the foo namespace
|
||||||
from foo_swig import *
|
from foo_swig import *
|
||||||
from selector import *
|
from selector import *
|
||||||
|
|
||||||
# import any pure python here
|
# import any pure python here
|
||||||
#
|
#
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
|
||||||
# Tail of workaround
|
|
||||||
if _RTLD_GLOBAL != 0:
|
|
||||||
sys.setdlopenflags(_dlopenflags) # Restore original flags
|
|
||||||
# ----------------------------------------------------------------
|
|
||||||
|
|||||||
@@ -21,10 +21,6 @@
|
|||||||
# Include swig generation macros
|
# Include swig generation macros
|
||||||
########################################################################
|
########################################################################
|
||||||
find_package(SWIG)
|
find_package(SWIG)
|
||||||
find_package(PythonLibs 2)
|
|
||||||
if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
include(GrSwig)
|
include(GrSwig)
|
||||||
include(GrPython)
|
include(GrPython)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user