diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-01 15:28:57 +0000 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-01 15:28:57 +0000 |
commit | 4974bc0b5ae38df989ed0d708299cca9f32046da (patch) | |
tree | 793a86ab7e771a595e04107562a197f9fa5e3005 | |
parent | a0e3938f0fb608de84c89f56203c9ab1523cdfee (diff) | |
download | dh-illumos-4974bc0b5ae38df989ed0d708299cca9f32046da.tar.gz |
Use default system GCC (4.7) and linker wrapper (GNU -> Sun)
-rwxr-xr-x | dh_illumos_gate | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/dh_illumos_gate b/dh_illumos_gate index 1b08674..765371c 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -18,8 +18,9 @@ B<dh_illumos_gate> [S<I<debhelper options>>] [B<-X>I<PATTERN>] =head1 DESCRIPTION C<dh_illumos_gate> is responsible for unpacking illumos sources and adjusting the sources -for Debian build environment (paths to programs, command options, etc.). It unpacks illumos -gate sources, creates F<illumos.sh> and F<bldenv.sh> in the root of source tree, +for Debian build environment (paths to programs, command options, linker and compiler flags, etc.). + +It unpacks illumos gate sources, creates F<illumos.sh> and F<bldenv.sh> in the root of source tree, sets variables in F<illumos.sh> (NIGHTLY_OPTIONS, CODEMGR_WS, and VERSION). VERSION is set as in F<debian/changelog> for package being built, e. g. C<export VERSION='uts_5.11.0-1~pre1'>. @@ -99,15 +100,15 @@ doit('sed', '-r', '-i', ' /INS\.file/ s, -f, -t,; /^__GNUC *=/ s,.*,__GNUC=,; /^__GNUC4 *=/ s,.*,__GNUC4=,; - /.*__GNUC4.GCC_ROOT/ s,.*,$(__GNUC4)GCC_ROOT = /usr/bin,; + /.*__GNUC4.GCC_ROOT/ s,.*,$(__GNUC4)GCC_ROOT = /usr,; ', $Makefile_master ); # Populate illumos-gate/illumos.sh with proper variables: -# 1. Set default build options +# 1. Set default build options and environment # 2. Set root directory for illumos-gate -# 3. Set VERSION = 'SRCPKG Version', e. g. "uts_5.11.0-1+b1" +# 3. Set VERSION = 'source version', e. g. "uts_5.11.0-1+b1" my $illumos_sh = 'illumos-gate/usr/src/tools/env/illumos.sh'; if (! -f $illumos_sh) { @@ -126,6 +127,13 @@ doit('sed', '-r', '-i', " /export +VERSION=/ s,.*,export VERSION='$version',; ", 'illumos-gate/illumos.sh'); +complex_doit(q(echo ' +export __GNUC="" +export CW_NO_SHADOW=1 +export LD_ALTEXEC=/usr/bin/ld-gnu-to-sun +' >> illumos-gate/illumos.sh +)); + doit('ln', '-s', '-f', 'usr/src/tools/scripts/bldenv.sh', 'illumos-gate/bldenv.sh'); =head1 SEE ALSO |