[Debian-ha-commits] [pacemaker] 07/10: Removed options for cf. Policy 10.2; causing issues with build system

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository pacemaker.

commit 4dca0d130b4fd568c3187b10db5d736099e8aa67
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun Apr 26 05:01:18 2015 -0400

    Removed options for cf. Policy 10.2; causing issues with build system
    
    For some reason when the aforementioned options are enabled
    libcrmcommon.la is not able to reference methods which are present
    
    Adjusted debian/changelog
    
    Change-Id: I2f0b1ab3f8e53d5f282b8d22c51cf939fb729ada
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/changelog | 2 --
 debian/rules     | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bb2a10..1c5968d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,8 +58,6 @@ pacemaker (1.1.12-1) UNRELEASED; urgency=medium
     python component; cst
   * debian/rules: Multiple edits;
     - Streamlined based on dh7 syntax
-    - Added flags to ensure that we link against all needed libs;
-      (cf. Policy 10.2)
     - Added instruction for building doxygen html API documentation
     - Override ./configure to ensure use of corosync as the cluster
       stack 
diff --git a/debian/rules b/debian/rules
index 2790400..4130343 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,9 @@
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+# The below options are disabled as it causes issues with the build;
 # Ensure that we link against all needed libraries (cf. Policy 10.2)
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
+#export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 
 # main packaging script based on dh7 syntax
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git