diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2020-02-16 17:35:57 +0100 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2020-02-16 17:58:42 +0100 |
commit | c7b64d0b57bd904279b7d17452e0ba553c0009c6 (patch) | |
tree | 319e6988761c3f55c2083bb29faac2d88a64628c /debian/patches/cross-compile.diff | |
parent | 09ab159217771479a944fa84334dc4587e3c4f23 (diff) | |
download | zsh-c7b64d0b57bd904279b7d17452e0ba553c0009c6.tar.gz zsh-c7b64d0b57bd904279b7d17452e0ba553c0009c6.zip |
Apply changes from Ubuntu's zsh 5.7.1-1ubuntu2 package
… except all debian/changelog entries and modifying the Maintainer
field.
This includes:
* debian/zshrc: Enable completions by default, unless
skip_global_compinit is set.
* Support cross-compiling:
+ Adjust upstream autoconf cross-compile default fallbacks.
+ Skip zcompile when cross-compiling.
+ Add libelf-dev build-dependency.
Gbp-Dch: Full
Diffstat (limited to 'debian/patches/cross-compile.diff')
-rw-r--r-- | debian/patches/cross-compile.diff | 64 |
1 files changed, 64 insertions, 0 deletions
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 + |