diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | dh_illumos_gate | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8d73872..56f9123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dh-illumos (9.5.4) UNRELEASED; urgency=low + + * Use explicit ctfstabs and ctfconvert for creating offsets + + -- Igor Pashev <pashev.igor@gmail.com> Sun, 18 Nov 2012 16:34:42 +0000 + dh-illumos (9.5.3) unstable; urgency=low * Disable CTF by default diff --git a/dh_illumos_gate b/dh_illumos_gate index 84ceaf4..72affcd 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -186,6 +186,13 @@ Delete (set to empty) variable C<MAPFILE.LEX>, cause we are not using shared lex library (F<libl.so.1>), but static Flex library (libl.a). +In variables C<OFFSETS_CREATE> and C<OFFSETS_CREATE64> replace +variables C<$(CTFSTABS)> and C<$(CTFCONVERT)> with explicit +F<ctfstabs> and F<ctfconvert>, because those variables are +empty when building without CTF, but creating offsets +really requires CTF data. This is used when compiling libc and +illumos kernel. + =cut my $multiarch = `dpkg-architecture -qDEB_HOST_MULTIARCH`; @@ -215,7 +222,7 @@ if (-f $Makefile_master) { doit('cp', '-f', $Makefile_master, $Makefile_master_orig); } - # Be carefull with modern CPP: + # Be careful with modern CPP: my $i386_undef = '-Uamd64 -U__amd64 -U__amd64__ -U__x86_64__ -U__x86_64 -U_LP64'; doit('sed', '-r', '-i', ' /^INS\.(file|dir)/ s, -s,,; @@ -224,6 +231,8 @@ if (-f $Makefile_master) { /^i386_AS_XARCH\s*=/s,$, ' . $i386_undef . ',; /^COMPILE\.s/s,$, $($(MACH)_AS_XARCH),; /^MAPFILE.LEX/d; + /^OFFSETS_CREATE/ s,\$\(CTFSTABS\),ctfstabs,; + /^OFFSETS_CREATE/ s,\$\(CTFCONVERT\),ctfconvert,; ', $Makefile_master ); } |