diff options
| author | Holger Hoffstätte <holger@applied-asynchrony.com> | 2025-09-11 13:58:56 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2025-11-11 20:07:02 +0100 |
| commit | 7e0e804b6966112e6793ebafa806ce04ead2e16c (patch) | |
| tree | 92f2e465dabf656277a046482f6f671bfeece975 /app-editors/vim-core/files | |
| parent | 012f5b62959a9e55c3a9fce3285689d296121472 (diff) | |
| download | gentoo-7e0e804b6966112e6793ebafa806ce04ead2e16c.tar.gz gentoo-7e0e804b6966112e6793ebafa806ce04ead2e16c.tar.bz2 gentoo-7e0e804b6966112e6793ebafa806ce04ead2e16c.zip | |
app-editors/vim-core: do not build/install xxd, depend on dev-util/xxd instead
Bug: https://bugs.gentoo.org/962554
Co-Authored-By: Lucio Sauer <watermanpaint@posteo.net>
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Part-of: https://github.com/gentoo/gentoo/pull/43726
Closes: https://github.com/gentoo/gentoo/pull/43726
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'app-editors/vim-core/files')
| -rw-r--r-- | app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch b/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch new file mode 100644 index 000000000000..d7a6dc1fd185 --- /dev/null +++ b/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch @@ -0,0 +1,35 @@ +The xxd utility is packaged in dev-util/xxd. With USE=nls, the prerequisite +$(INSTALL_TOOL_LANGS) target variable contains install-tool-languages, which +only installs xxd manpages. Remove it to prevent file collisions with +dev-util/xxd. + +From: Lucio Sauer <watermanpaint@posteo.net> +--- a/src/Makefile ++++ b/src/Makefile +@@ -947,7 +947,7 @@ EVIEWNAME = e$(VIEWNAME) + EVIEWTARGET = $(EVIEWNAME)$(LNKEXT) + + ### Names of the tools that are also made {{{1 +-TOOLS = xxd/xxd$(EXEEXT) ++TOOLS = + + ### Installation directories. The defaults come from configure. {{{1 + # +@@ -2533,16 +2533,11 @@ installspell: $(DEST_VIM) $(DEST_RT) $(DEST_SPELL) + + # install helper program xxd + installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ +- $(TOOLSSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TOOLS) \ +- $(INSTALL_TOOL_LANGS) ++ $(TOOLSSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TOOLS) + if test -f $(DEST_BIN)/xxd$(EXEEXT); then \ + mv -f $(DEST_BIN)/xxd$(EXEEXT) $(DEST_BIN)/xxd.rm; \ + rm -f $(DEST_BIN)/xxd.rm; \ + fi +- $(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN) +- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT) +- chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT) +- -$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS) + + # install the runtime tools + $(INSTALL_DATA_R) $(TOOLSSOURCE)/* $(DEST_TOOLS) |