summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/control1
-rwxr-xr-xdh_illumos_gate3
3 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b183daf..21fc10f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dh-illumos (9.5.9) unstable; urgency=medium
+
+ * dh_illumos_gate:
+ - define SAVEARGS= to disable -msave-args (not supported by our gcc)
+ - define CW_GCC=gcc so cw from onbld can pick ccache
+ - patch PATH in bldenv.sh: do not completely redefine PATH, but just
+ append it (for ccache too)
+
+ -- Igor Pashev <pashev.igor@gmail.com> Sun, 02 Mar 2014 13:39:36 +0400
+
dh-illumos (9.5.8) unstable; urgency=low
* Allow passing arbitrary options to tar in dh_illumos_gate
diff --git a/debian/control b/debian/control
index 9fce68a..ed5dce0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Multi-Arch: foreign
Depends: ${perl:Depends}, ${misc:Depends}, debhelper,
ksh93, make, ld-gnu-to-sun,
onbld,
+Breaks: onbld (<< 4.3)
Enhances: debhelper
Description: debhelper addons to work with illumos sources
This package provides debhelper addons configuring and building
diff --git a/dh_illumos_gate b/dh_illumos_gate
index c4d2285..5878cbd 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -363,6 +363,8 @@ if ( -d 'usr' && ! -f 'usr/env.sh') {
print ENV "export __GNUC=''\n";
print ENV "export __GNUC4=''\n";
print ENV "export GCC_ROOT='/usr'\n";
+ print ENV "export CW_GCC=gcc\n";
+ print ENV "export SAVEARGS=\n";
print ENV "export LEX='/usr/bin/flex -l'\n";
print ENV "export STRIP=':'\n";
print ENV "export MCS=':'\n";
@@ -398,6 +400,7 @@ if (-f $bldenv_sh && ! -f 'usr/bldenv.sh') {
doit('cp', '-f', $bldenv_sh, 'usr/bldenv.sh');
doit('sed', '-r', '-i', '
s,export +(CTF.+)="(.+)",export \1="${\1:-\2}",;
+ s,^PATH=".+",PATH="${PATH}:/opt/onbld/bin:/opt/onbld/bin/${MACH}:.",;
', 'usr/bldenv.sh'
);
}