rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

do not add python-libs into LDFLAGS until we build vim and gvim

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-11-06 18:15:16 +01:00
parent 99995c5193
commit 3f13abb69e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vim.spec
View File

@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
Name: vim Name: vim
Version: %{baseversion}.%{patchlevel} Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist} Release: 2%{?dist}
License: Vim and MIT License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh Source1: vim.sh
@ -267,12 +267,6 @@ mv -f Makefile.tmp Makefile
export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2" export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2" export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
%if 0%{?fedora} > 31
export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)"
%else
export LDFLAGS="%{build_ldflags} $(python3-config --libs)"
%endif
cp -f os_unix.h os_unix.h.save cp -f os_unix.h os_unix.h.save
cp -f ex_cmds.c ex_cmds.c.save cp -f ex_cmds.c ex_cmds.c.save
@ -311,6 +305,12 @@ make clean
mv -f os_unix.h.save os_unix.h mv -f os_unix.h.save os_unix.h
mv -f ex_cmds.c.save ex_cmds.c mv -f ex_cmds.c.save ex_cmds.c
%if 0%{?fedora} > 31
export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)"
%else
export LDFLAGS="%{build_ldflags} $(python3-config --libs)"
%endif
# More configure options: # More configure options:
# --enable-xim - enabling X Input Method - international input module for X, # --enable-xim - enabling X Input Method - international input module for X,
# it is for multibyte languages in Vim with X # it is for multibyte languages in Vim with X
@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/* %{_datadir}/icons/locolor/*/apps/*
%changelog %changelog
* Wed Nov 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2234-2
- do not add python-libs into LDFLAGS until we build vim and gvim
* Wed Oct 30 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2234-1 * Wed Oct 30 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2234-1
- patchlevel 2234 - patchlevel 2234