diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/dyson-missing-sig_atomic_t.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 35 |
5 files changed, 58 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8809884..d4ebf7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +bash (4.3-11+dyson1) unstable; urgency=medium + + * Package for Dyson + * Added dyson-missing-sig_atomic_t.patch + * Do not build static bash on illumos-amd64 + * Install everything under /usr on illumos + + -- Igor Pashev <pashev.igor@gmail.com> Wed, 08 Oct 2014 13:08:49 +0400 + bash (4.3-11) unstable; urgency=medium * Apply upstream patches 028 - 030. diff --git a/debian/control b/debian/control index f684aae..30490a5 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Description: GNU Bourne Again SHell the bash-completion package. Package: bash-static -Architecture: any +Architecture: linux-any hurd-any kfreebsd-any Multi-Arch: foreign Depends: passwd (>= 1:4.0.3-10), ${misc:Depends} Suggests: bash-doc diff --git a/debian/patches/dyson-missing-sig_atomic_t.patch b/debian/patches/dyson-missing-sig_atomic_t.patch new file mode 100644 index 0000000..2bd9452 --- /dev/null +++ b/debian/patches/dyson-missing-sig_atomic_t.patch @@ -0,0 +1,15 @@ +Index: bash-4.3/sig.h +=================================================================== +--- bash-4.3.orig/sig.h ++++ bash-4.3/sig.h +@@ -25,9 +25,7 @@ + + #include "stdc.h" + +-#if !defined (SIG_DFL) +-# include <signal.h> /* for sig_atomic_t */ +-#endif ++#include <signal.h> /* for sig_atomic_t */ + + #if !defined (SIGABRT) && defined (SIGIOT) + # define SIGABRT SIGIOT diff --git a/debian/patches/series b/debian/patches/series index f769de5..ee2d1e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -49,3 +49,4 @@ bash-aliases-repeat.diff # no-brk-caching.diff use-system-texi2html.diff bzero.diff +dyson-missing-sig_atomic_t.patch diff --git a/debian/rules b/debian/rules index 860e557..b374e43 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,16 @@ DEB_HOST_GNU_SYSTEM ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_SYSTEM) DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) +with_static := yes +ifeq ($(DEB_HOST_ARCH),illumos-amd64) +with_static := no +endif + +with_bin := yes +ifeq ($(DEB_HOST_ARCH_OS),illumos) +with_bin := no +endif + VERSION := 4.2 #PKGVERSION := $(shell dpkg-parsechangelog \ # | sed -n '/Version:/s/\(.* \)\(.*\)-2\(.*\)/\2\3/p') @@ -88,8 +98,11 @@ static_conf_args := $(conf_args) \ --enable-static-link \ --without-bash-malloc \ -#build: bash-build static-build preinst-build check -build: before-build bash-build static-build preinst-build check +ifeq ($(with_static),yes) +build: before-build bash-build preinst-build check static-build +else +build: before-build bash-build preinst-build check +endif build-arch: build build-indep: build @@ -191,8 +204,10 @@ stamps/stamp-install-bash: before-build stamps/stamp-build-bash dh_testdir dh_testroot dh_clean -k -p$(p) -p$(p_doc) -p$(p_bins) +ifeq ($(with_bin),yes) + dh_installdirs -p$(p) bin +endif dh_installdirs -p$(p) \ - bin \ etc/skel \ usr/share/doc/$(p) dh_installdirs -p$(p_doc) \ @@ -210,7 +225,9 @@ endif $(MAKE) -C build-bash install \ YACC="$(YACC)" \ DESTDIR=$(CURDIR)/$(d) +ifeq ($(with_bin),yes) mv $(d)/usr/bin/bash $(d)/bin/. +endif chmod 755 $(d)/usr/bin/bashbug $(ID) debian/bashbug.1 $(d)/usr/share/man/man1/ ifneq ($(with_gfdl),yes) @@ -222,7 +239,11 @@ endif rm -f $(d)/usr/share/info/dir* : # extra links +ifeq ($(with_bin),yes) ln -sf bash $(d)/bin/rbash +else + ln -sf bash $(d)/usr/bin/rbash +endif : # skeleton files $(ID) debian/etc.bash.bashrc $(d)/etc/bash.bashrc @@ -314,7 +335,11 @@ binary-bash: bash-install debian/bash.preinst dh_strip -p$(p) dh_compress -p$(p) dh_fixperms -p$(p) +ifeq ($(with_bin),yes) dh_shlibdeps -p$(p) -- -dPre-Depends $(d)/bin/bash debian/bash.preinst +else + dh_shlibdeps -p$(p) -- -dPre-Depends $(d)/usr/bin/bash debian/bash.preinst +endif dh_installdeb -p$(p) dh_gencontrol -p$(p) dh_md5sums -p$(p) @@ -355,7 +380,11 @@ binary-static: static-build dh_builddeb -p$(p_stat) binary-indep: binary-doc +ifeq ($(with_static),yes) binary-arch: binary-bash binary-builtins binary-static +else +binary-arch: binary-bash binary-builtins +endif binary: binary-indep binary-arch # --------------------------------------------------------------------------- |