diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-02 19:54:54 +0000 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-02 19:54:54 +0000 |
commit | 8db220a2889dc5c217054051c4e4108fe8ebf84f (patch) | |
tree | 4d82310527605dfcaebbba0468f1c525e9c51cb1 | |
parent | 069f192ff7938d4b435fdd0519a82c8a22fdbd25 (diff) | |
download | dh-illumos-8db220a2889dc5c217054051c4e4108fe8ebf84f.tar.gz |
Removed --bootstrap option: dh_illumos_make will do all tweaks
-rwxr-xr-x | dh_illumos_gate | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/dh_illumos_gate b/dh_illumos_gate index a7f0372..48932ec 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -14,7 +14,6 @@ use Cwd; =head1 SYNOPSIS B<dh_illumos_gate> [S<I<debhelper options>>] [B<-X>I<PATTERN>] -[B<--bootstrap>] =head1 DESCRIPTION @@ -59,12 +58,6 @@ illumos kernel (F<usr/src/uts>), you do not need libraries or programs and use F<-XI<usr/src/lib>> F<-XI<usr/src/cmd>>. These options passed as is to L<tar(1)> via I<--exclude=PATTERN>. -=item B<--bootstrap> - -Disable some features of illumos gate for easy bootstrapping. -This includes disabling executing of CTF tools (C<ctfconvert>, C<ctfmerge>), -C<mcs>, and others which may not be present on host system. - =back =head1 DETAILS @@ -76,7 +69,6 @@ Here are things which this helper does after unpacking illumos sources. =cut init(options => { - 'bootstrap' => \$dh{'BOOTSTRAP'}, }); my $tarball = '/usr/src/illumos-gate/illumos-gate.tar.xz'; @@ -119,13 +111,6 @@ Enable GCC and GCC4 mode by defining C<__GNUC> and C<__GNUC4>. Change GCC root to F</usr/>, so the default system compiler is used. -If B<--bootstrap> option is given, -define C<MCS>, C<CTFCONVERT>, and others to be just C<true>. -This helps to break cyclic dependencies, e. g. to build CTF tools -you need F<libctf> and for F<libctf> you need F<ctfconvert>. -Note: F<libctf> is not needed for C<ctfconvert>, but all CTF tools -are built all at once, and C<ctfstubs> needs F<libctf>. - =cut doit('sed', '-r', '-i', ' @@ -137,17 +122,6 @@ doit('sed', '-r', '-i', ' ', $Makefile_master ); - -if ($dh{'BOOTSTRAP'}) { - doit('sed', '-r', '-i', ' - /^MCS *=/ s,.*,MCS = /usr/bin/true,; - /^CTFCONVERT *=/ s,.*,CTFCONVERT = $(TRUE),; - /^CTFMERGE *=/ s,.*,CTFMERGE = $(TRUE),; - /^CTFSTABS *=/ s,.*,CTFSTABS = $(TRUE),; - ', $Makefile_master - ); -} - =item Change to F<usr/src/lib/Makefile.lib> Set library directories to be F</usr/lib/<multi-arch>>, @@ -227,22 +201,10 @@ export LD_ALTEXEC=/usr/bin/ld-gnu-to-sun Copy F<illumos-gate/usr/src/tools/scripts/bldenv.sh> to F<illumos-gate/bldenv.sh>. -If B<--bootstrap> option is given, delete definitions -of C<CTFMERGE> and C<CTFCONVERT>, so they will be defined as C<true> -in F<usr/src/Makefile.master> and will allow to build F<libctf>, -which is needed for other CTF tools. - =cut doit('cp', '-f', 'illumos-gate/usr/src/tools/scripts/bldenv.sh', 'illumos-gate/bldenv.sh'); -if ($dh{'BOOTSTRAP'}) { - doit('sed', '-r', '-i', ' - /export +CTFCONVERT=/d; - /export +CTFMERGE=/d; - ', 'illumos-gate/bldenv.sh'); -} - =back =head1 NOTES |