[vim] 01/06: Disable Perl bindings for kfreebsd-* systems
James McCoy
jamessan at debian.org
Sat Nov 12 18:19:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit c714de7e7e2f5946ec1522d7379c5fa5e365b4ff
Author: James McCoy <jamessan at debian.org>
Date: Sat Nov 5 22:16:26 2016 -0400
Disable Perl bindings for kfreebsd-* systems
See discussion in #827319, particularly
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=827319#111>.
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 7 +++++++
debian/control | 10 +++++-----
debian/rules | 11 +++++++++--
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e9b662..193a1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim (2:8.0.0022-2) UNRELEASED; urgency=medium
+
+ * Disable Perl bindings for kfreebsd-* until #827319 is resolved since the
+ FTBFS was blocking bootstrapping of kfreebsd systems.
+
+ -- James McCoy <jamessan at debian.org> Sat, 05 Nov 2016 22:14:40 -0400
+
vim (2:8.0.0022-1) unstable; urgency=medium
* syntax/debsources: Recognize https URLs. Thanks to Joe Stein for the
diff --git a/debian/control b/debian/control
index 0c24997..fbe1be2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: libacl1-dev, libgpmg1-dev [linux-any], autoconf,
libgtk2.0-dev, libgtk-3-dev, libxaw7-dev, libxt-dev, libxpm-dev,
# B-D for language interpreters
# Update d/rules when ruby version changes
- libperl-dev, tcl-dev, python3-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
+ libperl-dev [!kfreebsd-any], tcl-dev, python3-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
# ruby1.8{,-dev} Provides: ruby{,-dev} which can cause breakage on buildds if
# ruby/ruby1.8-dev or ruby1.8/ruby-dev pairs get installed due to a mismatch in
# the ruby binary version and the library version
@@ -118,7 +118,7 @@ Priority: extra
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -134,7 +134,7 @@ Priority: extra
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -150,7 +150,7 @@ Priority: extra
Architecture: any
Depends: vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: cscope, vim-doc
-Provides: vim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
Description: Vi IMproved - enhanced vi editor - with scripting languages support
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -166,7 +166,7 @@ Priority: extra
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: cscope, vim-doc
-Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
Description: Vi IMproved - enhanced vi editor - with Athena GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
diff --git a/debian/rules b/debian/rules
index a9b7093..140cc53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,14 @@ NOINTERPFLAGS+=--disable-tclinterp
ALLINTERPFLAGS:=--enable-luainterp
ALLINTERPFLAGS+=--disable-mzschemeinterp
-ALLINTERPFLAGS+=--enable-perlinterp
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ # Until #827319 is resolved
+ ALLINTERPFLAGS+=--disable-perlinterp
+ PERL_SUBSTVAR=
+else
+ ALLINTERPFLAGS+=--enable-perlinterp
+ PERL_SUBSTVAR=-Vvim:Perl-Provides=vim-perl
+endif
ALLINTERPFLAGS+=--enable-python3interp --with-python3-config-dir=$(shell python3-config --configdir)
ALLINTERPFLAGS+=--disable-pythoninterp
ALLINTERPFLAGS+=--enable-rubyinterp
@@ -470,7 +477,7 @@ binary-arch-%: install-stamp-%
dh_lintian
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- $(PERL_SUBSTVAR)
dh_md5sums
dh_builddeb -- -Zxz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list