From a89f89ee85fdadf017172a0be4594cb0c170c67c Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 22 Oct 2015 18:35:29 +0200 Subject: [PATCH] remove RTLD_GLOBAL workaround https://github.com/rubenk/collectd-ci/commit/4ef5784861 holds a small discussion about this. --- debian/changelog | 1 + debian/rules | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88d2293..6dc09d7 100644 --- 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 Tue, 06 Oct 2015 21:27:57 +0200 diff --git a/debian/rules b/debian/rules index 0da5b2b..b25ae8e 100755 --- 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 -- 2.30.2