diff options
| -rw-r--r-- | onbld/debian/control | 6 | ||||
| -rw-r--r-- | onbld/debian/patches/scanner.flex.patch | 3 | ||||
| -rw-r--r-- | onbld/debian/patches/series | 2 | ||||
| -rw-r--r-- | onbld/debian/patches/use-intptr_t.patch | 13 | ||||
| -rw-r--r-- | onbld/debian/patches/use-system-libdwarf.patch | 13 | ||||
| -rwxr-xr-x | onbld/debian/rules | 8 |
6 files changed, 44 insertions, 1 deletions
diff --git a/onbld/debian/control b/onbld/debian/control index 0372669..a2e925e 100644 --- a/onbld/debian/control +++ b/onbld/debian/control @@ -2,6 +2,12 @@ Source: onbld Section: devel Priority: optional Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + dh-illumos, + flex, + illumos-source, + libdwarf-dev, + libncurses5-dev, Standards-Version: 3.9.3 Package: onbld diff --git a/onbld/debian/patches/scanner.flex.patch b/onbld/debian/patches/scanner.flex.patch index 1170859..1b9f386 100644 --- a/onbld/debian/patches/scanner.flex.patch +++ b/onbld/debian/patches/scanner.flex.patch @@ -1,3 +1,6 @@ +Description: Adapt for using flex. + Note: flex must be executed in compatibility mode (-l) + Index: onbld/illumos-gate/usr/src/tools/cscope-fast/scanner.l =================================================================== --- onbld.orig/illumos-gate/usr/src/tools/cscope-fast/scanner.l 2012-06-26 00:14:27.000000000 +0000 diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series index 1ef4ac1..cfcb2bc 100644 --- a/onbld/debian/patches/series +++ b/onbld/debian/patches/series @@ -1,2 +1,4 @@ bool.patch scanner.flex.patch +use-intptr_t.patch +use-system-libdwarf.patch diff --git a/onbld/debian/patches/use-intptr_t.patch b/onbld/debian/patches/use-intptr_t.patch new file mode 100644 index 0000000..228b616 --- /dev/null +++ b/onbld/debian/patches/use-intptr_t.patch @@ -0,0 +1,13 @@ +Index: onbld/illumos-gate/usr/src/tools/cscope-fast/cgrep.c +=================================================================== +--- onbld.orig/illumos-gate/usr/src/tools/cscope-fast/cgrep.c 2012-06-26 00:14:27.000000000 +0000 ++++ onbld/illumos-gate/usr/src/tools/cscope-fast/cgrep.c 2012-07-03 21:48:55.748460968 +0000 +@@ -1045,7 +1045,7 @@ + { + Expr *e; + uchar_t *tab; +- int count; ++ intptr_t count; + + switch (toktype) { + case Backslash: diff --git a/onbld/debian/patches/use-system-libdwarf.patch b/onbld/debian/patches/use-system-libdwarf.patch new file mode 100644 index 0000000..259f597 --- /dev/null +++ b/onbld/debian/patches/use-system-libdwarf.patch @@ -0,0 +1,13 @@ +Index: onbld/illumos-gate/usr/src/tools/ctf/Makefile +=================================================================== +--- onbld.orig/illumos-gate/usr/src/tools/ctf/Makefile 2012-06-26 00:14:27.000000000 +0000 ++++ onbld/illumos-gate/usr/src/tools/ctf/Makefile 2012-07-03 22:57:18.435169014 +0000 +@@ -39,7 +39,7 @@ + + .KEEP_STATE: + +-all clean clobber install lint: dwarf .WAIT $(SUBDIRS) ++all clean clobber install lint: .WAIT $(SUBDIRS) + + dwarf $(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/onbld/debian/rules b/onbld/debian/rules index 71976f2..9be8781 100755 --- a/onbld/debian/rules +++ b/onbld/debian/rules @@ -3,13 +3,19 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) unpack: unpack-stamp -unpack-stamp: $(illtar) +unpack-stamp: dh_testdir dh_illumos_gate \ --exclude=usr/src/cmd \ --exclude=usr/src/man \ --exclude=usr/src/uts \ --exclude=usr/src/head + # i386_XARCH is set to -m32 by dh_illumos_gate, but + # we want native arch (64-bit): + echo "export i386_XARCH=''" >> illumos-gate/env.sh + # libncurses.so is actually linker script + # and sunld does not understand it, but we do not need sunld here ;-) + sed -i /LD_ALTEXEC/d illumos-gate/env.sh touch $@ patch: unpack |