Use ":" instead of "true". Disable stripping.

3 files changed, 13 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index f2a7b2d..060b3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ dh-illumos (7) UNRELEASED; urgency=low
 
   * Perl syntax error
   * Set LDLIBS32 and LDLIBS64 in env.sh to use libraries from debian/tmp
+  * Disable stripping. GNU strip can damage binaries, and we will carefully
+    strip when create package.
+  * Use ":" instead on "true"
 
- -- Igor Pashev <pashev.igor@gmail.com>  Sat, 18 Aug 2012 01:03:49 +0000
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 21 Aug 2012 12:37:00 +0000
 
 dh-illumos (6) unstable; urgency=low
 
diff --git a/dh_illumos_gate b/dh_illumos_gate
index a601bf1..2b6ca36 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -147,7 +147,7 @@ See L<ld-gnu-to-sun(1)>.
 
 Set proto area to be F<./debian/tmp>.
 
-Disable C<lint> libraries by replacing C<LINT> with L<true(1)>.
+Disable C<lint> libraries by replacing C<LINT> with ":".
 So it will do nothing. Successfully. Also define C<LINTLIB> to empty
 string to prevent installation of lint library (which does not exist).
 
@@ -189,7 +189,7 @@ if (open (ENV, '>', $env)) {
     print ENV "export LD_ALTEXEC='/usr/bin/ld-gnu-to-sun'\n";
     print ENV "export BUILD_TOOLS='/opt'\n";
     print ENV "export MACH='$mach'\n";
-    print ENV "export LINT='true'\n";
+    print ENV "export LINT=:\n";
     print ENV "export LINTLIB=''\n";
     print ENV "export __GNUC=''\n";
     print ENV "export __GNUC4=''\n";
@@ -202,6 +202,7 @@ if (open (ENV, '>', $env)) {
     print ENV "export LEX='/usr/bin/flex -l'\n";
     print ENV "export LDLIBS32=\"-L\$ROOTFS_LIBDIR -L\$ROOTLIBDIR\"\n";
     print ENV "export LDLIBS64=\"-L\$ROOTFS_LIBDIR64 -L\$ROOTLIBDIR64\"\n";
+    print ENV "export STRIP=':'\n";
 
     close(ENV);
 } else {
@@ -215,7 +216,7 @@ to F<illumos-gate/bldenv.sh>.
 
 Fix definition of C<CTF*> variables, so this script will
 not override them if they are already defined. These variables
-can be set to C<true>, when executing L<dh_illumos_make(1)>
+can be set to ":", when executing L<dh_illumos_make(1)>
 with option C<--without-ctf>.
 
 =cut
diff --git a/dh_illumos_make b/dh_illumos_make
index 4bf41b6..823b5bf 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -66,14 +66,13 @@ Do not use CTF (I<Compact C Type Format>) tools during build.
 Every ELF object built from illumos sources should be processed
 by these tools, even F<libctf> itself. This option is useful
 for bootstrapping when CTF tools are not available. This is
-implemented by setting corresponding environment variables to
-L<true(1)>.
+implemented by setting corresponding environment variables to ":".
 
 =item B<--without-mcs>
 
 Do not manipulate the comment section of generated objects during build.
 These operations require MCS tool, which may not be available when bootstrapping.
-Likewise, variable C<MCS> will be defined as L<true(1)>.
+Likewise, variable C<MCS> will be defined as ":".
 
 =item B<--no-onbld>
 
@@ -133,9 +132,9 @@ my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
 $opts .= $onbld;
 
 my $env = '';
-$env .= ' MCS=true' if $dh{'WITHOUT_MCS'};
-$env .= ' CTFCONVERT=true' if $dh{'WITHOUT_CTF'};
-$env .= ' CTFMERGE=true' if $dh{'WITHOUT_CTF'};
+$env .= ' MCS=:' if $dh{'WITHOUT_MCS'};
+$env .= ' CTFCONVERT=:' if $dh{'WITHOUT_CTF'};
+$env .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};
 foreach (@dirs) {
     complex_doit(qq!cd illumos-gate && $env /usr/bin/ksh93 bldenv.sh $opts env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}"!);
 }