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

r3794 - in glibc-package/trunk/debian: . rules.d



Author: aurel32
Date: 2009-09-03 09:51:36 +0000 (Thu, 03 Sep 2009)
New Revision: 3794

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
  * Strip *.o files manually (dh_strip does not do it) to prevent
    leakage of the build directory.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2009-09-03 09:41:03 UTC (rev 3793)
+++ glibc-package/trunk/debian/changelog	2009-09-03 09:51:36 UTC (rev 3794)
@@ -3,6 +3,8 @@
   [ Aurelien Jarno ]
   * Extend description of libc-bin, patch by Christoph Berg. Closes: 
     bug#544389.
+  * Strip *.o files manually (dh_strip does not do it) to prevent
+    leakage of the build directory.
 
   [ Samuel Thibault ]
   * debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk	2009-09-03 09:41:03 UTC (rev 3793)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk	2009-09-03 09:51:36 UTC (rev 3794)
@@ -66,8 +66,11 @@
 	# table in libc6-dbg but basic thread debugging should
 	# work even without that package installed.
 
+	# strip *.o files as dh_strip does not (yet?) do it.
+
 	if test "$(NOSTRIP_$(curpass))" != 1; then			\
 	  dh_strip -p$(curpass) -Xlibpthread --dbg-package=$(libc)-dbg; \
+	  								\
 	  (cd debian/$(curpass);					\
 	   find . -name libpthread-\*.so -exec objcopy			\
 	     --only-keep-debug '{}' ../$(libc)-dbg/usr/lib/debug/'{}'   \
@@ -78,6 +81,17 @@
 	  find debian/$(curpass) -name libpthread-\*.so -exec		\
 	    strip --strip-debug --remove-section=.comment		\
 	    --remove-section=.note '{}' ';' || true;			\
+	    								\
+	  (cd debian/$(curpass);					\
+	   find . -name \*crt\*.o -exec objcopy				\
+	     --only-keep-debug '{}' ../$(libc)-dbg/usr/lib/debug/'{}'   \
+	     ';' || true;						\
+	   find . -name \*crt\*.o -exec objcopy				\
+	     --add-gnu-debuglink=../$(libc)-dbg/usr/lib/debug/'{}'	\
+	     '{}' ';' || true);						\
+	  find debian/$(curpass) -name \*crt\*.o -exec			\
+	    strip --strip-debug --remove-section=.comment		\
+	    --remove-section=.note --strip-unneeded '{}' ';' || true;	\
 	fi
 endif
 


Reply to: