remove RTLD_GLOBAL workaround

https://github.com/rubenk/collectd-ci/commit/4ef5784861 holds a small
discussion about this.

diff --git a/debian/changelog b/debian/changelog
index 88d22930b732815e3ee083ae6056045e5b716238..6dc09d7c0a3c6e967e6c65502814f7859969b1cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ collectd (5.5.0-4) UNRELEASED; urgency=medium
     - Update 'binary-or-shlib-defines-rpath' lintian override.
   * debian/rules:
     - Strip out non-deterministic bits out of generated jar files.
+    - Remove RTLD_GLOBAL workaround, which was fixed upstream.
 
  -- Marc Fournier <marc@bl.uem.li>  Tue, 06 Oct 2015 21:27:57 +0200
 

diff --git a/debian/rules b/debian/rules
index 0da5b2bebde227c405990e67a406900ca458dc4f..b25ae8e9e1ba1c0e663d77bc8b37172881681051 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,6 @@ CPPFLAGS += -I$(CURDIR)/debian/include
 CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS += -Wall -Wno-error=deprecated-declarations
 
-# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
-# however required by the perl plugin (which would otherwise be unable to find
-# symbols defined in libperl when loading perl modules that require such
-# symbols). This is a workaround for this issue.
-CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
-
 # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to
 # /etc/collectd would be wrong though.
 CPPFLAGS += -UCONFIGFILE