[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: debian/rules.d/debhelper.mk: strip all *crt*.o files, unless DEB_BUILD_OPTIONS contains nostrip. Closes: #884524.



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

aurel32 pushed a commit to branch sid
in repository glibc.

commit 6c6484d2c22b1a60d3dec8af8fae2236530f18b0
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Dec 16 12:20:29 2017 +0100

    debian/rules.d/debhelper.mk: strip all *crt*.o files, unless DEB_BUILD_OPTIONS contains nostrip.  Closes: #884524.
---
 debian/changelog            |  4 ++++
 debian/rules.d/debhelper.mk | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a30046..f23313e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ glibc (2.25-5) UNRELEASED; urgency=medium
   [ Samuel Thibault ]
   * hurd-i386/git-rtld-access.diff: Fix spurious errno update.
 
+  [ Aurelien Jarno ]
+  * debian/rules.d/debhelper.mk: strip all *crt*.o files, unless
+    DEB_BUILD_OPTIONS contains nostrip.  Closes: #884524.
+
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 12 Dec 2017 23:52:07 +0100
 
 glibc (2.25-4) unstable; urgency=medium
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 840e059..61972e9 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -55,13 +55,13 @@ ifeq ($(filter nostrip,$(DEB_BUILD_OPTIONS)),)
 	      $(DEB_HOST_GNU_TYPE)-strip --strip-debug --remove-section=.comment	\
 	                                 --remove-section=.note $$f ;			\
 	    done ;									\
-	    for f in $$(find debian/$(curpass) -name \*crt\*.o) ; do			\
-	      $(DEB_HOST_GNU_TYPE)-strip --strip-debug --remove-section=.comment	\
-	                                 --remove-section=.note $$f ;			\
-	    done ;									\
 	  else										\
 	    dh_strip -p$(curpass) -Xlibpthread;						\
-	  fi										\
+	  fi ;										\
+	  for f in $$(find debian/$(curpass) -name \*crt\*.o) ; do			\
+	    $(DEB_HOST_GNU_TYPE)-strip --strip-debug --remove-section=.comment		\
+	                               --remove-section=.note $$f ;			\
+	  done ;									\
 	fi
 endif
 

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


Reply to: