Fix building without wayland
Currently, due broken dependency generation, wayland support is hardcoded in Makefile. We have to run dependency generation and auto generation at every `make` call. Additionally, function prototypes are now generated by python3 and its clang module during build - added buildrequires for it.
This commit is contained in:
parent
61cfcde9de
commit
0c4cede346
1 changed files with 34 additions and 0 deletions
34
vim.spec
34
vim.spec
|
|
@ -122,6 +122,10 @@ BuildRequires: make
|
|||
# screen handling library
|
||||
BuildRequires: ncurses-devel
|
||||
|
||||
# for building function prototypes
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-clang
|
||||
|
||||
# for python plugin
|
||||
BuildRequires: python3-devel
|
||||
|
||||
|
|
@ -444,6 +448,15 @@ perl -pi -e "s/vimrc/virc/" os_unix.h
|
|||
--enable-year2038 \
|
||||
--disable-libsodium
|
||||
|
||||
# related to the previous issue with `make depend`, auto/osdef.h
|
||||
# has to be generated
|
||||
make auto/osdef.h
|
||||
# wayland is hardwired in Makefile dependencies
|
||||
# to work around it call `make depend` before build
|
||||
# problem fixed by https://github.com/vim/vim/pull/18538
|
||||
# remove once it is merged
|
||||
make depend
|
||||
|
||||
%make_build
|
||||
cp vim minimal-vim
|
||||
make clean
|
||||
|
|
@ -503,6 +516,15 @@ mv -f os_unix.h.save os_unix.h
|
|||
--enable-year2038 \
|
||||
--disable-canberra
|
||||
|
||||
## related to the previous issue with `make depend`, auto/osdef.h
|
||||
## has to be generated
|
||||
make auto/osdef.h
|
||||
# wayland is hardwired in Makefile dependencies
|
||||
# to work around it call `make depend` before build
|
||||
# problem fixed by https://github.com/vim/vim/pull/18538
|
||||
# remove once it is merged
|
||||
make depend
|
||||
|
||||
%make_build
|
||||
cp vim enhanced-vim
|
||||
|
||||
|
|
@ -566,6 +588,15 @@ cp vim enhanced-vim
|
|||
--enable-socketserver \
|
||||
--enable-canberra
|
||||
|
||||
# related to the issue with `make depend`, auto/osdef.h
|
||||
# has to be generated
|
||||
make auto/osdef.h auto/gui_gtk_gresources.h auto/wayland/wlr-data-control-unstable-v1.h
|
||||
# wayland is hardwired in Makefile dependencies
|
||||
# to work around it call `make depend` before build
|
||||
# problem fixed by https://github.com/vim/vim/pull/18538
|
||||
# remove once it is merged
|
||||
make depend
|
||||
|
||||
%make_build
|
||||
cp vim gvim
|
||||
make clean
|
||||
|
|
@ -581,6 +612,9 @@ cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
|
|||
rm -f README*.info
|
||||
|
||||
cd src
|
||||
# related to the issue with `make depend`, auto/osdef.h
|
||||
# has to be generated
|
||||
make auto/osdef.h auto/gui_gtk_gresources.h auto/wayland/wlr-data-control-unstable-v1.h
|
||||
# Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself
|
||||
# and put the stripped files into correct dirs. Build system (koji/brew)
|
||||
# does it for us, so there is no need to do it in Vim
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue