diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-13 17:23:32 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-13 17:23:32 +0000 |
| commit | cc1e466fbf10ed3b58218efbc89e7ccad0d65402 (patch) | |
| tree | 0a3a0fe8f622286266f7958215649f2401358b39 | |
| parent | f88d6bc20f710fe9ab4309ce2601edea3d6a1a60 (diff) | |
| download | dh-illumos-cc1e466fbf10ed3b58218efbc89e7ccad0d65402.tar.gz | |
Use /usr/lib32 for 32-bit libraries
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | dh_illumos_gate | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 541d3ac..2d83df8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dh-illumos (5) unstable; urgency=low + + * Use /usr/lib32 for 32-bit libraries + + -- Igor Pashev <pashev.igor@gmail.com> Fri, 13 Jul 2012 17:22:51 +0000 + dh-illumos (4) unstable; urgency=low * Fixed manpage formatting diff --git a/dh_illumos_gate b/dh_illumos_gate index b57ad99..44d13a3 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -174,8 +174,9 @@ my $version = $changelog->{'Source'} . '_' . $changelog->{'Version'}; my $cwd = getcwd(); my $env = 'illumos-gate/env.sh'; my $mach = `uname -p`; chomp $mach; +# XXX Only illumos-amd64 is supported now XXX my $multiarch64 = `dpkg-architecture -aillumos-amd64 -qDEB_HOST_MULTIARCH`; -my $multiarch32 = `dpkg-architecture -aillumos-i386 -qDEB_HOST_MULTIARCH`; +#my $multiarch32 = `dpkg-architecture -aillumos-i386 -qDEB_HOST_MULTIARCH`; chomp $multiarch32; chomp $multiarch64; if (open (ENV, '>', $env)) { @@ -196,9 +197,9 @@ if (open (ENV, '>', $env)) { print ENV "export GCC_ROOT='/usr'\n"; print ENV "export i386_XARCH='-m32'\n"; print ENV "export i386_AS_XARCH='-xarch=i386'\n"; - print ENV "export ROOTFS_LIBDIR=\"\$ROOT/lib/$multiarch32\"\n"; + print ENV "export ROOTFS_LIBDIR=\"\$ROOT/usr/lib32\"\n"; print ENV "export ROOTFS_LIBDIR64=\"\$ROOT/lib/$multiarch64\"\n"; - print ENV "export ROOTLIBDIR=\"\$ROOT/usr/lib/$multiarch32\"\n"; + print ENV "export ROOTLIBDIR=\"\$ROOT/usr/lib32\"\n"; print ENV "export ROOTLIBDIR64=\"\$ROOT/usr/lib/$multiarch64\"\n"; print ENV "export LEX='/usr/bin/flex -l'\n"; close(ENV); |