[Glibc-bsd-commits] r4241 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-04-27 22:16:35 +0000 (Fri, 27 Apr 2012)
New Revision: 4241

Added:
   trunk/freebsd-buildutils/debian/patches/nostrip.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
nostrip.diff: By default, install without -s.  Let dh_strip, etc handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-04-27 22:15:25 UTC (rev 4240)
+++ trunk/freebsd-buildutils/debian/changelog	2012-04-27 22:16:35 UTC (rev 4241)
@@ -3,8 +3,11 @@
   * disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid
     triggering #664242.
   * Fix getopt declaration.
+  * Add MK_CTF build option.
+  * nostrip.diff: By default, install without -s.  Let dh_strip, etc
+    handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc).
 
- -- Robert Millan <rmh at debian.org>  Wed, 04 Apr 2012 23:51:04 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Apr 2012 00:16:19 +0200
 
 freebsd-buildutils (9.0-9) unstable; urgency=low
 

Added: trunk/freebsd-buildutils/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/nostrip.diff	2012-04-27 22:16:35 UTC (rev 4241)
@@ -0,0 +1,48 @@
+
+By default, install without -s.  Let dh_strip, etc handle stripping
+(and honor DEB_BUILD_OPTIONS=nostrip, etc).
+
+--- a/ports/Mk/bsd.port.subdir.mk
++++ b/ports/Mk/bsd.port.subdir.mk
+@@ -55,7 +55,7 @@
+ .MAIN: all
+ 
+ .if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
++#STRIP?=	-s
+ .endif
+ 
+ # These are variables that are invariant for the lifetime of a recursive port traversal
+--- a/src/share/mk/bsd.lib.mk
++++ b/src/share/mk/bsd.lib.mk
+@@ -42,7 +42,7 @@
+ .endif
+ 
+ .if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
++#STRIP?=	-s
+ .endif
+ 
+ .include <bsd.libnames.mk>
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -183,7 +183,7 @@
+ 
+ # Common variables
+ .if !defined(DEBUG_FLAGS)
+-STRIP?=		-s
++#STRIP?=		-s
+ .endif
+ 
+ COMPRESS_CMD?=	gzip -cn -9
+--- a/src/share/mk/bsd.prog.mk
++++ b/src/share/mk/bsd.prog.mk
+@@ -29,7 +29,7 @@
+ .endif
+ 
+ .if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
++#STRIP?=	-s
+ .endif
+ 
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2012-04-27 22:15:25 UTC (rev 4240)
+++ trunk/freebsd-buildutils/debian/patches/series	2012-04-27 22:16:35 UTC (rev 4241)
@@ -20,3 +20,4 @@
 21_endian.diff
 22_ld_as_needed.diff
 disable_wsystem_headers.diff
+nostrip.diff