[Pkg-ceph-commits] [ceph] 05/07: Link with libatomic and --as-needed on all archs

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel
in repository ceph.

commit b7e92635a709f0d0a977c6d912b48e9f84e35327
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Wed Jan 11 09:43:26 2017 +0100

    Link with libatomic and --as-needed on all archs
    
    --as-needed was already used anyway, so we can link with libatomic
    everywhere and let the linker decide if it's needed. This should fix the
    build for several more non-release architectures.
    
    Closes: #850831
---
 debian/rules | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index b6513ed..557eb4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,10 @@
 
 # Limit parallel builds to 2 for now
 
-# minimise needless linking
-export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
+# minimise needless linking and link to libatomic
+# The last is needed because long long atomic operations are not directly
+# supported by all processor architectures
+export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed -latomic
 
 # Enable hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -58,15 +60,12 @@ extraopts += --with-system-libs3
 # fails when testing xfs.h on 32bit systems.
 export DEB_CPPFLAGS_MAINT_APPEND=-D_FILE_OFFSET_BITS=64
 
-# Build fixes for mips/mipsel
+# Build fix for mips/mipsel
 # The first two variables work around a compiler bug which leads to virtual
 # memory exhaustion while compiling the testsuite. See Debian bug #849657.
-# The last is needed because long long atomic operations are not directly
-# supported by the processor.
 ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
   export DEB_CFLAGS_MAINT_APPEND= --param ggc-min-expand=5
   export DEB_CXXFLAGS_MAINT_APPEND= --param ggc-min-expand=5
-  export DEB_LDFLAGS_MAINT_APPEND= -latomic
 endif
 
 %:

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