diff options
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/cross-compile.diff | 64 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/zshrc | 8 |
5 files changed, 78 insertions, 0 deletions
diff --git a/debian/control b/debian/control index c629003f8..f620ffda0 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: bsdmainutils, groff, groff-base, libcap-dev [linux-any], + libelf-dev, libncursesw5-dev, libpcre3-dev, texinfo (>= 5~), diff --git a/debian/patches/cross-compile.diff b/debian/patches/cross-compile.diff new file mode 100644 index 000000000..0fbe17d76 --- /dev/null +++ b/debian/patches/cross-compile.diff @@ -0,0 +1,64 @@ +Description: Adjust cross-compile fallback values to yes. +Origin: commit, revision id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt +Author: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> +Last-Update: 2012-12-20 +X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt + +=== modified file 'aczsh.m4' +--- old/aczsh.m4 2009-09-08 17:04:03 +0000 ++++ new/aczsh.m4 2012-12-20 15:33:57 +0000 +@@ -171,7 +171,7 @@ + } + ], [zsh_cv_shared_$1=yes], + [zsh_cv_shared_$1=no], +-[zsh_cv_shared_$1=no] ++[zsh_cv_shared_$1=yes] + ) + else + zsh_cv_shared_$1=no +@@ -242,7 +242,7 @@ + } + ], [zsh_cv_sys_dynamic_clash_ok=yes], + [zsh_cv_sys_dynamic_clash_ok=no], +-[zsh_cv_sys_dynamic_clash_ok=no] ++[zsh_cv_sys_dynamic_clash_ok=yes] + ) + else + zsh_cv_sys_dynamic_clash_ok=no +@@ -315,7 +315,7 @@ + } + ], [zsh_cv_sys_dynamic_rtld_global=yes], + [zsh_cv_sys_dynamic_rtld_global=no], +-[zsh_cv_sys_dynamic_rtld_global=no] ++[zsh_cv_sys_dynamic_rtld_global=yes] + ) + else + zsh_cv_sys_dynamic_rtld_global=no +@@ -384,7 +384,7 @@ + int fred () { return 42; } + ], [zsh_cv_sys_dynamic_execsyms=yes], + [zsh_cv_sys_dynamic_execsyms=no], +-[zsh_cv_sys_dynamic_execsyms=no] ++[zsh_cv_sys_dynamic_execsyms=yes] + ) + LDFLAGS=$save_ldflags + else +@@ -457,7 +457,7 @@ + int fred () { return 42; } + ], [zsh_cv_sys_dynamic_strip_exe=yes], + [zsh_cv_sys_dynamic_strip_exe=no], +-[zsh_cv_sys_dynamic_strip_exe=no] ++[zsh_cv_sys_dynamic_strip_exe=yes] + ) + LDFLAGS=$save_ldflags + else +@@ -522,7 +522,7 @@ + } + ], [zsh_cv_sys_dynamic_strip_lib=yes], + [zsh_cv_sys_dynamic_strip_lib=no], +-[zsh_cv_sys_dynamic_strip_lib=no] ++[zsh_cv_sys_dynamic_strip_lib=yes] + ) + else + zsh_cv_sys_dynamic_strip_lib=no + diff --git a/debian/patches/series b/debian/patches/series index c4da55074..5caf1786c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ further-mitigate-test-suite-hangs.patch update-debian-sections.patch +cross-compile.diff example-shebang.patch diff --git a/debian/rules b/debian/rules index eb98a4dce..b7f817434 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk H_LDFLAGS = $(LDFLAGS) @@ -93,6 +94,8 @@ override_dh_auto_install-indep: build-dynamic cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh-common +# move this to a non-root section; also drop it for cross-compiles +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; \ /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \ END { printf "%s/%s\n", head, tail; };' \ @@ -103,6 +106,7 @@ override_dh_auto_install-indep: build-dynamic zcompile -U -M $$i.zwc $$i/*~*.zwc(^/); \ chmod 644 $$i.zwc; \ done' +endif # Docs: Info + HTML cd obj && $(MAKE) install.info install.html \ diff --git a/debian/zshrc b/debian/zshrc index 45aebde31..54681368e 100644 --- a/debian/zshrc +++ b/debian/zshrc @@ -102,3 +102,11 @@ zstyle ':completion:*:sudo:*' command-path /usr/local/sbin \ (( ${+aliases[run-help]} )) && unalias run-help autoload -Uz run-help + +# If you don't want compinit called here, place the line +# skip_global_compinit=1 +# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofile +if [[ -z "$skip_global_compinit" ]]; then + autoload -U compinit + compinit +fi |