From b854d1f98eb36bcb0d491ba696eb03bb7d7aa6df Mon Sep 17 00:00:00 2001 From: Scott Torborg Date: Wed, 17 May 2017 13:15:53 -0700 Subject: [PATCH] Remove RTLD_GLOBAL hack for swig: it is no longer necessary, and causes some compatibility problems with gr-qtgui --- python/__init__.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/python/__init__.py b/python/__init__.py index 7bbf6b9..4398f03 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -23,24 +23,6 @@ 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 pyqt namespace #from pyqt_swig import * @@ -75,9 +57,3 @@ from set_title import * from table import * from dict_ui_source import * - -# ---------------------------------------------------------------- -# Tail of workaround -if _RTLD_GLOBAL != 0: - sys.setdlopenflags(_dlopenflags) # Restore original flags -# ----------------------------------------------------------------