diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-09-01 20:00:11 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-09-01 20:00:11 +0000 |
| commit | 7a19d68cd46f2e3a24f2458677f1f5fce201dc01 (patch) | |
| tree | ace6cbfed0e9cdf7e39230ba68c6b87c108280e4 | |
| parent | 714d195e2772faea597e24a31b89e4d43aceb111 (diff) | |
| download | dh-illumos-7a19d68cd46f2e3a24f2458677f1f5fce201dc01.tar.gz | |
Set i386_XARCH in Makefile to allow overriding
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_illumos_gate | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d99c0a0..68d94fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ dh-illumos (8) UNRELEASED; urgency=low * Depends on make, not sunmake + * Set i386_XARCH in Makefile to allow overriding - -- Igor Pashev <pashev.igor@gmail.com> Fri, 31 Aug 2012 18:02:21 +0000 + -- Igor Pashev <pashev.igor@gmail.com> Sat, 01 Sep 2012 19:59:53 +0000 dh-illumos (7) unstable; urgency=low diff --git a/dh_illumos_gate b/dh_illumos_gate index 10a228a..713fb45 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -107,6 +107,9 @@ Remove option C<-s> (strip) from install command for directories and files. This options does not make sense for directories and GNU L<install(1)> is not tolerant here. Also replace option C<-f> with C<-t>. +Set C<i386_XARCH> to C<-m32> since native host compiler can produce 32-bit +code by default. + =cut my $Makefile_master_orig = $Makefile_master . '.orig'; @@ -120,6 +123,7 @@ if (! -e $Makefile_master_orig) { doit('sed', '-r', '-i', ' /^INS\.(file|dir)/ s, -s,,; /^INS\.file/ s, -f, -t,; + s,^i386_XARCH\s*=.*,i386_XARCH=-m32,; ', $Makefile_master ); @@ -209,7 +213,6 @@ if (open (ENV, '>', $env)) { print ENV "export __GNUC=''\n"; print ENV "export __GNUC4=''\n"; print ENV "export GCC_ROOT='/usr'\n"; - print ENV "export i386_XARCH='-m32'\n"; print ENV "export LEX='/usr/bin/flex -l'\n"; print ENV "export STRIP=':'\n"; |