summaryrefslogtreecommitdiff
path: root/gr-utils/python/modtool/gr-newmod
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-08-11 09:21:37 -0400
committerTom Rondeau <tom@trondeau.com>2014-08-11 09:21:37 -0400
commit39f14138ac9158eb0610e89a2ae1f8290f184c44 (patch)
treee1af86b1441fa5f03e5901286fa24788415da9bd /gr-utils/python/modtool/gr-newmod
parent3d5df0ddd3aa8d5a94285b95f487747f25d4ee06 (diff)
modtool: removing RTLD_GLOBAL hack for swig in gr-modtool.
This was removed from GNU Radio a while ago due to newer issues. Looks like it's affecting OOT modules as well.
Diffstat (limited to 'gr-utils/python/modtool/gr-newmod')
-rw-r--r--gr-utils/python/modtool/gr-newmod/python/__init__.py24
1 files changed, 0 insertions, 24 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/python/__init__.py b/gr-utils/python/modtool/gr-newmod/python/__init__.py
index d852fda545..ed385a0abe 100644
--- a/gr-utils/python/modtool/gr-newmod/python/__init__.py
+++ b/gr-utils/python/modtool/gr-newmod/python/__init__.py
@@ -23,24 +23,6 @@ This is the GNU Radio HOWTO 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 howto namespace
try:
# this might fail if the module is python-only
@@ -50,9 +32,3 @@ except ImportError:
# import any pure python here
#
-
-# ----------------------------------------------------------------
-# Tail of workaround
-if _RTLD_GLOBAL != 0:
- sys.setdlopenflags(_dlopenflags) # Restore original flags
-# ----------------------------------------------------------------