Author: aurel32
Date: 2011-12-24 10:00:20 +0000 (Sat, 24 Dec 2011)
New Revision: 5106

Modified:
   glibc-package/trunk/debian/rules
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Strip packages for which we don't want debug


Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules    2011-12-21 08:05:42 UTC (rev 5105)
+++ glibc-package/trunk/debian/rules    2011-12-24 10:00:20 UTC (rev 5106)
@@ -154,9 +154,9 @@
 
 # Don't run dh_strip on this package
 NOSTRIP_$(libc)-dbg = 1
-NOSTRIP_libc-bin = 1
-NOSTRIP_libc-dev-bin = 1
-NOSTRIP_nscd = 1
+NODEBUG_libc-bin = 1
+NODEBUG_libc-dev-bin = 1
+NODEBUG_nscd = 1
 
 ifeq ($(threads),yes)
 DEB_ARCH_REGULAR_PACKAGES += nscd

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk     2011-12-21 08:05:42 UTC 
(rev 5105)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk     2011-12-24 10:00:20 UTC 
(rev 5106)
@@ -65,30 +65,34 @@
 
        # 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/'{}'   \
-            ';' || true;                                               \
-          find . -name libpthread-\*.so -exec objcopy                  \
-            --add-gnu-debuglink=../$(libc)-dbg/usr/lib/debug/'{}'      \
-            '{}' ';' || true);                                         \
-         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 '{}' ';' || true;    \
+       if test "$(NOSTRIP_$(curpass))" != 1; then                              
\
+         if test "$(NODEBUG_$(curpass))" != 1; then                            
\
+           dh_strip -p$(curpass) -Xlibpthread --dbg-package=$(libc)-dbg;       
\
+         else                                                                  
\
+           dh_strip -p$(curpass) -Xlibpthread                                  
\
+         fi                                                                    
\
+                                                                               
\
+         (cd debian/$(curpass);                                                
\
+          find . -name libpthread-\*.so -exec objcopy                          
\
+            --only-keep-debug '{}' ../$(libc)-dbg/usr/lib/debug/'{}'           
\
+            ';' || true;                                                       
\
+          find . -name libpthread-\*.so -exec objcopy                          
\
+            --add-gnu-debuglink=../$(libc)-dbg/usr/lib/debug/'{}'              
\
+            '{}' ';' || true);                                                 
\
+         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 '{}' ';' || true;                            
\
        fi
 endif
 


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to