r6201 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2014-07-10 19:49:24 +0000 (Thu, 10 Jul 2014)
New Revision: 6201
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
debian/rules.d/debhelper.mk: fix dh_strip call in stage1.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-07-06 20:34:28 UTC (rev 6200)
+++ glibc-package/trunk/debian/changelog 2014-07-10 19:49:24 UTC (rev 6201)
@@ -1,6 +1,7 @@
glibc (2.19-6) UNRELEASED; urgency=medium
- *
+ [ Helmut Grohne ]
+ * debian/rules.d/debhelper.mk: fix dh_strip call in stage1.
-- Aurelien Jarno <aurel32@debian.org> Sun, 06 Jul 2014 22:34:19 +0200
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2014-07-06 20:34:28 UTC (rev 6200)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2014-07-10 19:49:24 UTC (rev 6201)
@@ -8,6 +8,10 @@
non-debug-packages = $(filter-out %-dbg,$(DEB_ARCH_REGULAR_PACKAGES))
$(patsubst %,$(stamp)binaryinst_%,$(debug-packages)):: $(patsubst %,$(stamp)binaryinst_%,$(non-debug-packages))
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+DH_STRIP_DEBUG_PACKAGE=--dbg-package=$(libc)-dbg
+endif
+
$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)):: $(patsubst %,$(stamp)install_%,$(GLIBC_PASSES)) debhelper
@echo Running debhelper for $(curpass)
dh_testroot
@@ -49,7 +53,7 @@
# strip *.o files as dh_strip does not (yet?) do it.
if test "$(NOSTRIP_$(curpass))" != 1; then \
if test "$(NODEBUG_$(curpass))" != 1; then \
- dh_strip -p$(curpass) -Xlibpthread --dbg-package=$(libc)-dbg; \
+ dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE); \
(cd debian/$(curpass); \
find . -name libpthread-\*.so -exec objcopy \
--only-keep-debug '{}' ../$(libc)-dbg/usr/lib/debug/'{}' \
Reply to: