Build mdb for i86 and amd64

5 files changed, 55 insertions, 10 deletions

diff --git a/mdb/debian/control b/mdb/debian/control
index 5c2ba2e..e6ea3cb 100644
--- a/mdb/debian/control
+++ b/mdb/debian/control
@@ -5,16 +5,16 @@ Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
  illumos-source-2.10,
- libc-db1-dev,
- libctf-dev,
- libkvm-dev,
- libncurses5-dev,
- libproc1-dev,
- libscf1-dev,
- libsunelf1-dev | libelfg0-dev,
- libumem-dev,
- libsundisasm1-dev,
- libstanddisasm-dev,
+ libc-db1-dev       , lib32c-db1-dev [illumos-amd64]       , 
+ libctf-dev         , li32ctf-dev [illumos-amd64]          , 
+ libkvm-dev         , lib32kvm-dev [illumos-amd64]         , 
+ libncurses5-dev    , lib32ncurses5-dev [illumos-amd64]    , 
+ libproc1-dev       , lib32proc1-dev [illumos-amd64]       , 
+ libscf1-dev        , lib32scf1-dev [illumos-amd64]        , 
+ libstanddisasm-dev , lib32standdisasm-dev [illumos-amd64] , 
+ libsundisasm1-dev  , lib32sundisasm1-dev [illumos-amd64]  , 
+ libsunelf-dev      , lib32sunelf-dev [illumos-amd64]      , 
+ libumem-dev        , lib32umem-dev [illumos-amd64]        , 
  ncurses-term,
  quilt,
  sgs-lex,
diff --git a/mdb/debian/patches/mdb-kvm_amd64dep.c-pointers.patch b/mdb/debian/patches/mdb-kvm_amd64dep.c-pointers.patch
new file mode 100644
index 0000000..d3708c0
--- /dev/null
+++ b/mdb/debian/patches/mdb-kvm_amd64dep.c-pointers.patch
@@ -0,0 +1,13 @@
+Index: mdb/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c	2013-04-25 22:37:18.301123568 +0400
+@@ -272,7 +272,7 @@
+ 	};
+ 
+ 	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &addr, sizeof (addr),
+-	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != NULL &&
++	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != 0 &&
+ 	    mdb_tgt_vread(t, &regs, sizeof (regs), addr) == sizeof (regs)) {
+ 		kt_regs_to_kregs(&regs, kt->k_regs);
+ 		return;
diff --git a/mdb/debian/patches/mdb-no-isaexec.patch b/mdb/debian/patches/mdb-no-isaexec.patch
new file mode 100644
index 0000000..6d615d8
--- /dev/null
+++ b/mdb/debian/patches/mdb-no-isaexec.patch
@@ -0,0 +1,24 @@
+Index: mdb/usr/src/cmd/mdb/intel/ia32/mdb/Makefile
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/intel/ia32/mdb/Makefile	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/intel/ia32/mdb/Makefile	2013-04-25 22:11:11.822687923 +0400
+@@ -42,8 +42,4 @@
+ 
+ CPPFLAGS += -I../../mdb
+ 
+-install: all $(ISAEXEC) $(ROOTPROG32) $(ROOTLINK32)
+-	-$(RM) $(ROOTPROG)
+-	-$(LN) $(ISAEXEC) $(ROOTPROG)
+-	-$(RM) $(ROOTLINK)
+-	-$(LN) $(ISAEXEC) $(ROOTLINK)
++install: all $(ROOTPROG32)
+Index: mdb/usr/src/cmd/mdb/intel/amd64/mdb/Makefile
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/intel/amd64/mdb/Makefile	2012-10-08 04:25:29.000000000 +0400
++++ mdb/usr/src/cmd/mdb/intel/amd64/mdb/Makefile	2013-04-25 22:36:18.503554431 +0400
+@@ -50,4 +50,4 @@
+ 
+ CPPFLAGS += -I../../mdb
+ 
+-install: all $(ISAEXEC) $(ROOTPROG64) $(ROOTLINK64)
++install: all $(ROOTPROG64)
diff --git a/mdb/debian/patches/series b/mdb/debian/patches/series
index 72b5b8b..d261f7b 100644
--- a/mdb/debian/patches/series
+++ b/mdb/debian/patches/series
@@ -22,3 +22,5 @@ mdb-mdb_proc.c-pointers.patch
 mdb-use-libsundisasm.patch
 mdb-libtinfo.patch
 mdb-demangle.patch
+mdb-no-isaexec.patch
+mdb-kvm_amd64dep.c-pointers.patch
diff --git a/mdb/debian/rules b/mdb/debian/rules
index 4106742..2477258 100755
--- a/mdb/debian/rules
+++ b/mdb/debian/rules
@@ -44,11 +44,17 @@ unpatch:
 
 dirs-stamp: unpack-stamp
 	. usr/env.sh; mkdir -p \
+		debian/tmp/usr/bin \
 		debian/tmp/usr/include/sys \
 		debian/tmp$$DEB_LIBDIR_32 \
 		debian/tmp$$DEB_LIBDIR_64 \
 		debian/tmp$$DEB_USRLIBDIR_32 \
 		debian/tmp$$DEB_USRLIBDIR_64
+ifeq (amd64,$(DEB_HOST_ARCH_CPU))
+	mkdir -p debian/tmp/usr/bin/amd64
+	mkdir -p debian/tmp/usr/bin/i86
+	ln -sf amd64/mdb debian/tmp/usr/bin/mdb
+endif
 	# libncurses workaround:
 	# libcurses.so is a linker script for GNU ld.
 	# The linker we have to use (SunOS ld) does not understand it.