diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-04-15 13:45:35 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-04-15 13:45:35 +0400 |
| commit | 2a40c195a9eaff9744e8ef14c425ef51b5275b9b (patch) | |
| tree | 6eee9b2823822f8e9f81796f16f8f2a24fe572c9 /mdb | |
| parent | 101ca0d96c9e25d9d1aa4edfc513201b5a28f1a5 (diff) | |
| download | illumos-packaging-2a40c195a9eaff9744e8ef14c425ef51b5275b9b.tar.gz | |
Build mdb out of illumos source tree
Diffstat (limited to 'mdb')
| -rw-r--r-- | mdb/debian/patches/mdb-gcore-prdata.h.patch | 14 | ||||
| -rw-r--r-- | mdb/debian/patches/mdb-includes.patch | 12 | ||||
| -rw-r--r-- | mdb/debian/patches/series | 2 | ||||
| -rwxr-xr-x | mdb/debian/rules | 5 |
4 files changed, 30 insertions, 3 deletions
diff --git a/mdb/debian/patches/mdb-gcore-prdata.h.patch b/mdb/debian/patches/mdb-gcore-prdata.h.patch new file mode 100644 index 0000000..fb200ae --- /dev/null +++ b/mdb/debian/patches/mdb-gcore-prdata.h.patch @@ -0,0 +1,14 @@ +Description: use system installed header +Index: mdb/usr/src/cmd/mdb/common/modules/genunix/gcore.c +=================================================================== +--- mdb.orig/usr/src/cmd/mdb/common/modules/genunix/gcore.c 2014-04-15 12:02:52.333058147 +0400 ++++ mdb/usr/src/cmd/mdb/common/modules/genunix/gcore.c 2014-04-15 12:09:14.761825109 +0400 +@@ -59,7 +59,7 @@ + #include <sys/wait.h> + #include <vm/seg.h> + #include <vm/vpage.h> +-#include <fs/proc/prdata.h> ++#include <sys/proc/prdata.h> + + #undef exit + diff --git a/mdb/debian/patches/mdb-includes.patch b/mdb/debian/patches/mdb-includes.patch new file mode 100644 index 0000000..f802a3c --- /dev/null +++ b/mdb/debian/patches/mdb-includes.patch @@ -0,0 +1,12 @@ +Index: mdb/usr/src/Makefile.master +=================================================================== +--- mdb.orig/usr/src/Makefile.master 2014-04-15 12:02:33.646237338 +0400 ++++ mdb/usr/src/Makefile.master 2014-04-15 12:42:47.043350647 +0400 +@@ -553,6 +553,7 @@ + CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \ + $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include + CPPFLAGS= $(CPPFLAGS.master) ++CPPFLAGS += -I/usr/include/illumos + AS_CPPFLAGS= $(CPPFLAGS.master) + JAVAFLAGS= -deprecation + diff --git a/mdb/debian/patches/series b/mdb/debian/patches/series index 1d9bd09..53a122f 100644 --- a/mdb/debian/patches/series +++ b/mdb/debian/patches/series @@ -69,3 +69,5 @@ mdb-genunix-zone-pointers.patch mdb-genunix-typegraph-pointers.patch mdb-genunix-gcore-pointers.patch mdb-no-saveargs.patch +mdb-gcore-prdata.h.patch +mdb-includes.patch diff --git a/mdb/debian/rules b/mdb/debian/rules index 85e246b..fc61320 100755 --- a/mdb/debian/rules +++ b/mdb/debian/rules @@ -29,7 +29,6 @@ unpack-stamp: usr/src/common/util \ $(cmd:%=usr/src/cmd/%) \ $(man) \ - --wildcards-match-slash usr/src/uts/\*.h # Buggy and unused: @@ -103,12 +102,12 @@ binary-stamp: install-stamp dh_testdir dh_testroot dh_installdirs - dh_install dh_install -p mdb usr/bin/mdb ifeq (illumos-amd64,$(DEB_HOST_ARCH)) dh_install -p mdb usr/bin/amd64/mdb dh_install -p mdb32 usr/bin/i86/mdb endif + dh_install --list-missing dh_installman dh_installdocs dh_installexamples @@ -128,6 +127,6 @@ endif clean: unpatch dh_testdir dh_testroot - dh_clean rm -rf usr .pc + dh_clean |