summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-10-17 19:59:57 +0400
committerIgor Pashev <pashev.igor@gmail.com>2012-10-17 19:59:57 +0400
commit062f101dc60e59559eb77a1573a566289d897a2b (patch)
tree0a16e92274480ec5a3f410e3daa35dc4a60c4459
parent325d26ad3c3f71720caa846ca70679d7e7ce0691 (diff)
downloaddh-illumos-062f101dc60e59559eb77a1573a566289d897a2b.tar.gz
Define all DEB_* in illumos-gate/env.sh
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_illumos_gate4
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index eef85ec..ec19272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-illumos (10) UNRELEASED; urgency=low
+
+ * Export all DEB_* variables into illumos-gate/env.sh
+ to make them available from makefiles.
+
+ -- Igor Pashev <pashev.igor@gmail.com> Wed, 17 Oct 2012 19:57:30 +0400
+
dh-illumos (9) unstable; urgency=low
* Completely disable modifying comment section of ELFs,
diff --git a/dh_illumos_gate b/dh_illumos_gate
index 7620c05..12f2e78 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -221,6 +221,9 @@ expect default compiler to generate 32-bit code.
Define C<LEX> to be C</usr/bin/flex -l>.
+Export all C<DEB_*> variables (using C<dpkg-architecture -s>)
+to make them available from makefiles.
+
=cut
my $cwd = getcwd();
@@ -252,6 +255,7 @@ if (open (ENV, '>', $env)) {
print ENV "export LDLIBS32=\"-YP,\$ROOT/\$DEB_LIBDIR_32:\$ROOT/\$DEB_USRLIBDIR_32\"\n";
print ENV "export LDLIBS64=\"-YP,\$ROOT/\$DEB_LIBDIR_64:\$ROOT/\$DEB_USRLIBDIR_64\"\n";
print ENV 'export LDLIBS_NATIVE="', ($bits == 64) ? '$LDLIBS64' : '$LDLIBS32', "\"\n";
+ print ENV `dpkg-architecture -s`;
close(ENV);
} else {