Author: aurel32
Date: 2011-12-24 17:23:22 +0000 (Sat, 24 Dec 2011)
New Revision: 5107
Modified:
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Fix previous commit
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2011-12-24 10:00:20 UTC (rev 5106)
+++ glibc-package/trunk/debian/rules 2011-12-24 17:23:22 UTC (rev 5107)
@@ -154,6 +154,8 @@
# Don't run dh_strip on this package
NOSTRIP_$(libc)-dbg = 1
+
+# Don't put debug files from these packages in libc-dbg
NODEBUG_libc-bin = 1
NODEBUG_libc-dev-bin = 1
NODEBUG_nscd = 1
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2011-12-24 10:00:20 UTC
(rev 5106)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2011-12-24 17:23:22 UTC
(rev 5107)
@@ -64,35 +64,33 @@
# work even without that package installed.
# 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 --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;
\
else
\
- dh_strip -p$(curpass) -Xlibpthread
\
+ 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]
