Disable CTF by defaultv9.5.3

2 files changed, 17 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 2823cef..8d73872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-illumos (9.5.3) unstable; urgency=low
+
+  * Disable CTF by default
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 17 Nov 2012 00:24:06 +0000
+
 dh-illumos (9.5.2) unstable; urgency=low
 
   * ld-gnu-to-sun depends on sunld 
diff --git a/dh_illumos_make b/dh_illumos_make
index 3e1fce4..a1a18b9 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -12,7 +12,7 @@ use Debian::Debhelper::Dh_Lib;
 =head1 SYNOPSIS
 
 B<dh_illumos_make> [S<I<debhelper options>>] [B<-m>I<make program>]
-[B<-t>I<target>] [B<--debug>] [B<--without-ctf>]
+[B<-t>I<target>] [B<--debug>] [B<--ctf>]
 [B<--no-onbld>] [B<--native>]
 [directories]
 
@@ -58,13 +58,13 @@ instead of
 
     ksh93 usr/bldenv.sh usr/env.sh ...
 
-=item B<--without-ctf>
+=item B<--ctf>
 
-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 ":".
+Do use CTF (I<Compact C Type Format>) tools during build.
+Every ELF object built from illumos sources used to be processed
+by these tools, even F<libctf> itself. As a side effect any
+debug information is being stripped out from resulting binaries.
+This is not acceptable on Debian, so CTF is not used by default.
 
 =item B<--no-onbld>
 
@@ -91,14 +91,14 @@ proto area is F<debian/tmp>.
 
 $dh{'MAKE'} = '/usr/bin/make --sun';
 $dh{'TARGET'} = 'install';
-$dh{'WITHOUT_CTF'} = 0;
+$dh{'CTF'} = 0;
 $dh{'NO_ONBLD'} = 0;
 
 init(options => { 
     'make|m=s'    => \$dh{'MAKE'},
     'target|t=s'  => \$dh{'TARGET'},
     'debug'       => \$dh{'DEBUG'},
-    'without-ctf' => \$dh{'WITHOUT_CTF'},
+    'ctf!'        => \$dh{'CTF'},
     'no-onbld'    => \$dh{'NO_ONBLD'},
     'native'      => \$dh{'NATIVE'},
 });
@@ -130,8 +130,8 @@ my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
 $opts .= $onbld;
 
 my $override = '';
-$override .= ' CTFCONVERT=:' if $dh{'WITHOUT_CTF'};
-$override .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};
+$override .= ' CTFCONVERT=:' if not $dh{'CTF'};
+$override .= ' CTFMERGE=:' if not $dh{'CTF'};
 
 if ($dh{'NATIVE'}) {
     my $deb_host_arch_cpu = `dpkg-architecture -qDEB_HOST_ARCH_CPU`;