pool/vim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 90166 from home:elvigia:branches:editors

Browse Source 
Intended for 12.1 and factory, plz forward accordingly.

- vim-enhanced,gvim: Never ever link against static libpython
  this happends because %{_libdir}/python$vesion/config is
  searched first and picks libpython.a instead of .so ...

OBS-URL: https://build.opensuse.org/request/show/90166
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=66
This commit is contained in:
Ismail Dönmez 2011-11-06 08:57:45 +00:00 committed by Git OBS Bridge
parent a2ff8b4189
commit 071ee1d47a
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vim.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Nov 6 03:49:09 UTC 2011 - crrodriguez@opensuse.org
- vim-enhanced,gvim: Never ever link against static libpython
this happends because %{_libdir}/python$vesion/config is
searched first and picks libpython.a instead of .so ...
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 18 17:16:30 CEST 2011 - dmueller@suse.de Tue Oct 18 17:16:30 CEST 2011 - dmueller@suse.de

6
vim.spec
View File

@ -112,6 +112,7 @@ Patch22: %{name}-7.3-filetype_mine.patch
Patch25: vim-7.2-lzma-support.patch Patch25: vim-7.2-lzma-support.patch
Patch27: %{name}-7.3-disable_gcc_warning_eval_c.patch Patch27: %{name}-7.3-disable_gcc_warning_eval_c.patch
Patch100: vim-7.1.314-CVE-2009-0316-debian.patch Patch100: vim-7.1.314-CVE-2009-0316-debian.patch
Patch101: vim73-no-static-libpython.patch
%description %description
Vim (Vi IMproved) is an almost compatible version of the UNIX editor Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@ -277,6 +278,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
#%patch25 #%patch25
%patch27 -p1 %patch27 -p1
%patch100 -p1 %patch100 -p1
%patch101
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} . cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} .
#rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* #rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
#rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no* #rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
@ -314,6 +316,10 @@ export GUI_OPTIONS="\
--enable-gtk2-check \ --enable-gtk2-check \
--with-gtk-prefix=/opt/gnome \ --with-gtk-prefix=/opt/gnome \
--with-gnome=/opt/gnome" --with-gnome=/opt/gnome"
pushd src
autoconf
popd
# #
# build small default binary # build small default binary
%configure \ %configure \

11
vim73-no-static-libpython.patch Normal file
View File

@ -0,0 +1,11 @@
--- src/configure.in.orig
+++ src/configure.in
@@ -881,7 +881,7 @@ eof
if test "${vi_cv_var_python_version}" = "1.4"; then
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
else
- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+ vi_cv_path_python_plibs="-lpython${vi_cv_var_python_version}"
fi
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses