diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-05 06:45:43 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-05 06:45:43 +0000 |
| commit | 4541b52a3d9347ba775c275d7c51785972f0c00c (patch) | |
| tree | 062456c569e48d8d8e96a1e9a7b575d1934e4459 | |
| parent | 41d769b88a7be65ac6dd68cbf32cd9629ddded6a (diff) | |
| download | illumos-packaging-4541b52a3d9347ba775c275d7c51785972f0c00c.tar.gz | |
Build ctfstabs later
| -rw-r--r-- | onbld/debian/patches/postpone-ctf-stabs.patch | 17 | ||||
| -rw-r--r-- | onbld/debian/patches/series | 1 | ||||
| -rwxr-xr-x | onbld/debian/rules | 8 |
3 files changed, 25 insertions, 1 deletions
diff --git a/onbld/debian/patches/postpone-ctf-stabs.patch b/onbld/debian/patches/postpone-ctf-stabs.patch new file mode 100644 index 0000000..bbafe70 --- /dev/null +++ b/onbld/debian/patches/postpone-ctf-stabs.patch @@ -0,0 +1,17 @@ +Description: Postpone building ctfstubs + because it needs libctf and building libctf requires + other CTF tools. So, we build everything but ctfstubs, + then libctf, then ctfstabs. +Index: onbld/illumos-gate/usr/src/tools/ctf/Makefile +=================================================================== +--- onbld.orig/illumos-gate/usr/src/tools/ctf/Makefile 2012-07-05 06:01:39.076130658 +0000 ++++ onbld/illumos-gate/usr/src/tools/ctf/Makefile 2012-07-05 06:02:51.640444926 +0000 +@@ -27,7 +27,7 @@ + + include ../Makefile.tools + +-SUBDIRS = cvt dump stabs scripts ++SUBDIRS = cvt dump scripts + + .PARALLEL: $(SUBDIRS) + diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series index 8aceb87..c983cc9 100644 --- a/onbld/debian/patches/series +++ b/onbld/debian/patches/series @@ -9,3 +9,4 @@ no-install.patch protocmp.x86_64.patch protolist.x86_64.patch no-elfsign.patch +postpone-ctf-stabs.patch diff --git a/onbld/debian/rules b/onbld/debian/rules index 2ca31a4..ee5fecb 100755 --- a/onbld/debian/rules +++ b/onbld/debian/rules @@ -31,7 +31,12 @@ unpatch: install build build-arch build-indep: build-stamp build-stamp: patch - dh_illumos_make usr/src/tools -t install + # ctfstabs needs libctf, libctf needs ctfconvert + # We've disabled ctfstabs via patch to build all tools + # not requiring lbctf, then build libctf, then - ctfstabs: + dh_illumos_make usr/src/tools + dh_illumos_make usr/src/lib/libctf/amd64 + dh_illumos_make usr/src/tools/ctf/stabs touch $@ binary binary-arch binary-indep: binary-stamp @@ -53,6 +58,7 @@ binary-stamp: build-stamp dh_gencontrol dh_md5sums dh_builddeb + touch $@ clean: unpatch dh_testdir |