Completely disable modifying comment section of ELFs

3 files changed, 11 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index ffde801..3bb7f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dh-illumos (9) UNRELEASED; urgency=low
+
+  * Completely disable modifying comment section of ELFs,
+    cause dh_strip used to delete it. Also this avoid additional
+    build dependency on "mcs" utility.
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 01 Oct 2012 04:57:33 +0400
+
 dh-illumos (8) unstable; urgency=low
 
   * Depends on make, not sunmake
diff --git a/dh_illumos_gate b/dh_illumos_gate
index c604a3d..3397e73 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -190,6 +190,8 @@ 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).
 
+Disable modifying comment section of ELFs by replacing C<MCS> with ":".
+
 Enable GCC and GCC4 mode by defining C<__GNUC> and C<__GNUC4>.
 
 Change GCC root to F</usr>, so the default system compiler is used.
@@ -227,6 +229,7 @@ if (open (ENV, '>', $env)) {
     print ENV "export GCC_ROOT='/usr'\n";
     print ENV "export LEX='/usr/bin/flex -l'\n";
     print ENV "export STRIP=':'\n";
+    print ENV "export MCS=':'\n";
     print ENV "export LDLIBS32=\"-YP,\$ROOT/$libdir:\$ROOT/$usrlibdir\"\n";
     print ENV "export LDLIBS64=\"-YP,\$ROOT/$libdir64:\$ROOT/$usrlibdir64\"\n";
     print ENV 'export LDLIBS_NATIVE="', ($bits == 64) ? '$LDLIBS64' : '$LDLIBS32', "\"\n";
diff --git a/dh_illumos_make b/dh_illumos_make
index f1d36a0..2b9bee5 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -68,12 +68,6 @@ 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 ":".
 
-=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 ":".
-
 =item B<--no-onbld>
 
 Do not use C<onbld> tools installed in system (F</opt/onbld>). Normally it only works
@@ -100,7 +94,6 @@ proto area is F<debian/tmp>.
 $dh{'MAKE'} = '/usr/bin/make --sun';
 $dh{'TARGET'} = 'install';
 $dh{'WITHOUT_CTF'} = 0;
-$dh{'WITHOUT_MCS'} = 0;
 $dh{'NO_ONBLD'} = 0;
 
 init(options => { 
@@ -108,7 +101,6 @@ init(options => {
     'target|t=s'  => \$dh{'TARGET'},
     'debug'       => \$dh{'DEBUG'},
     'without-ctf' => \$dh{'WITHOUT_CTF'},
-    'without-mcs' => \$dh{'WITHOUT_MCS'},
     'no-onbld'    => \$dh{'NO_ONBLD'},
     'native'      => \$dh{'NATIVE'},
 });
@@ -140,7 +132,6 @@ my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
 $opts .= $onbld;
 
 my $env = '';
-$env .= ' MCS=:' if $dh{'WITHOUT_MCS'};
 $env .= ' CTFCONVERT=:' if $dh{'WITHOUT_CTF'};
 $env .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};