summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-12-05 04:27:20 +0000
committerSam James <sam@gentoo.org>2022-12-05 04:27:20 +0000
commit9a6c024b51e8ae69076c948204bddee0cfc002fc (patch)
tree9ab4e44e387036c960f725c8730d472ba162f58e /007_all_vim-8.2.0210-python3-shared-lib.patch
parentupdate patchset for vim 9.0.0049 (diff)
downloadvim-patches-9a6c024b51e8ae69076c948204bddee0cfc002fc.tar.gz
vim-patches-9a6c024b51e8ae69076c948204bddee0cfc002fc.tar.bz2
vim-patches-9a6c024b51e8ae69076c948204bddee0cfc002fc.zip
update patchset for vim 9.0.1000vim-9.0.1000-patches
- Rename 005_all_vim_7.1-ada-default-compiler.patch - Rename 006-vim-8.2.5066-crosscompile.patch - Rename 007-vim-8.2.0210-python3-shared-lib.patch - Add 008_all_vim-9.0.1000-perl-mode.patch Bug: https://bugs.gentoo.org/881385 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '007_all_vim-8.2.0210-python3-shared-lib.patch')
-rw-r--r--007_all_vim-8.2.0210-python3-shared-lib.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/007_all_vim-8.2.0210-python3-shared-lib.patch b/007_all_vim-8.2.0210-python3-shared-lib.patch
new file mode 100644
index 0000000..84ec559
--- /dev/null
+++ b/007_all_vim-8.2.0210-python3-shared-lib.patch
@@ -0,0 +1,16 @@
+Drop python3 config dir from library search list to avoid linking against the
+static library that may exist there (bug #669306).
+
+diff --git a/src/configure.ac b/src/configure.ac
+index a098da82e..7aedd7bee 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -1496,7 +1496,7 @@ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
++ vi_cv_path_python3_plibs="-lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
+ vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`