* dh_illumos_gate:

    - Extract usr/src/cmd/Makefile* if any path under
      usr/src/cmd is being extracted and -B option is given.
    - Remove trailing spaces in TEXT_DOMAIN definition
      in usr/src/cmd/Makefile.cmd.
    - Remove the MAPFILE.LEX variable from usr/src/Makefile.master.

  * dh_illumos_make:
    - adjust MAPFILE.NGB for native builds (i386 vs amd64).
    - pass overriden variables as make agruments, not as shell
      environment (native builds).

3 files changed, 24 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 1e9613a..8dfb40b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 dh-illumos (9.5) UNRELEASED; urgency=low
 
-  * Extract usr/src/cmd/Makefile* if any path 
-    under usr/src/cmd is being extracted
-    and -B option is given.
-  * Remove trailing spaces in TEXT_DOMAIN definition
-    in usr/src/cmd/Makefile.cmd
+  * dh_illumos_gate:
+    - Extract usr/src/cmd/Makefile* if any path under
+      usr/src/cmd is being extracted and -B option is given.
+    - Remove trailing spaces in TEXT_DOMAIN definition
+      in usr/src/cmd/Makefile.cmd.
+    - Remove the MAPFILE.LEX variable from usr/src/Makefile.master.
+
+  * dh_illumos_make:
+    - adjust MAPFILE.NGB for native builds (i386 vs amd64).
+    - pass overriden variables as make agruments, not as shell
+      environment (native builds).
 
  -- Igor Pashev <pashev.igor@gmail.com>  Sun, 04 Nov 2012 20:04:05 +0400
 
diff --git a/dh_illumos_gate b/dh_illumos_gate
index d03b085..84ceaf4 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -182,6 +182,10 @@ and C<i386_AS_XARCH>.
 
 C<i386_AS_XARCH> flags are appended to C<COMPILE.s> command.
 
+Delete (set to empty) variable C<MAPFILE.LEX>, cause we are not
+using shared lex library (F<libl.so.1>), but static Flex
+library (libl.a).
+
 =cut
 
 my $multiarch = `dpkg-architecture -qDEB_HOST_MULTIARCH`;
@@ -219,6 +223,7 @@ if (-f $Makefile_master) {
         /^i386_XARCH\s*=/s,$, -m32 ' . $i386_undef . ',;
         /^i386_AS_XARCH\s*=/s,$, '   . $i386_undef . ',;
         /^COMPILE\.s/s,$, $($(MACH)_AS_XARCH),;
+        /^MAPFILE.LEX/d;
         ', $Makefile_master
     );
 }
diff --git a/dh_illumos_make b/dh_illumos_make
index 1ae4316..c2290b3 100755
--- a/dh_illumos_make
+++ b/dh_illumos_make
@@ -129,19 +129,19 @@ $opts .= '-d' if $dh{'DEBUG'};
 my $onbld = $dh{'NO_ONBLD'} ? '-t' : '+t';
 $opts .= $onbld;
 
-my $env = '';
-$env .= ' CTFCONVERT=:' if $dh{'WITHOUT_CTF'};
-$env .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};
+my $override = '';
+$override .= ' CTFCONVERT=:' if $dh{'WITHOUT_CTF'};
+$override .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'};
 
 if ($dh{'NATIVE'}) {
-    $env .= ' i386_XARCH=';
-    $env .= ' LDLIBS32="\$LDLIBS_NATIVE"';
+    my $deb_host_arch_cpu = `dpkg-architecture -qDEB_HOST_ARCH_CPU`;
+    $override .= ' i386_XARCH=';
+    $override .= " LDLIBS32='\$(LDLIBS_NATIVE)'";
+    $override .= " MAPFILE.NGB='\$(MAPFILE.NGB_$deb_host_arch_cpu)'";
 }
 
-$env = "export $env &&" if $env;
-
 foreach (@dirs) {
-    complex_doit(qq!ksh93 usr/bldenv.sh $opts usr/env.sh -c "cd $_ && $env $dh{'MAKE'} $dh{'TARGET'}"!);
+    complex_doit(qq!ksh93 usr/bldenv.sh $opts usr/env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}$override"!);
 }
 
 =head1 SEE ALSO