SPECS (AC-branch): vim.spec - more options moved to common function
glen
glen at pld-linux.org
Fri May 30 07:28:13 CEST 2008
Author: glen Date: Fri May 30 05:28:13 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- more options moved to common function
---- Files affected:
SPECS:
vim.spec (1.407.2.17 -> 1.407.2.18)
---- Diffs:
================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.407.2.17 SPECS/vim.spec:1.407.2.18
--- SPECS/vim.spec:1.407.2.17 Fri May 30 06:49:42 2008
+++ SPECS/vim.spec Fri May 30 07:28:08 2008
@@ -614,7 +614,18 @@
shift
%{__make} distclean
+ # add common options, can override (disable) if needed with args
%configure \
+ --%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
+ --%{!?with_python:dis}%{?with_python:en}able-pythoninterp \
+ --%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \
+ --%{!?with_tcl:dis}%{?with_tcl:en}able-tclinterp \
+ %{!?with_selinux:--disable-selinux} \
+ --enable-cscope \
+ --enable-gpm \
+ --enable-multibyte \
+ --enable-nls \
+ --with-tlib="ncurses -ltinfo" \
--with-modifiedby="PLD Linux Distribution" \
--with-compiledby="PLD Linux Distribution" \
"$@"
@@ -628,79 +639,45 @@
build vim.static \
--disable-gui \
--without-x \
+ --with-features=small \
--disable-perlinterp \
--disable-pythoninterp \
--disable-rubyinterp \
- %{!?with_selinux:--disable-selinux} \
--disable-tclinterp \
--disable-cscope \
--disable-gpm \
--disable-multibyte \
- --with-features=small \
- --with-tlib="ncurses -ltinfo" \
--disable-nls
+
LDFLAGS="%{rpmldflags}"
%endif
build vim.ncurses \
--disable-gui \
--without-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --enable-cscope \
- --enable-gpm \
- --with-features=huge \
- --enable-multibyte \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --with-features=huge
%if %{with athena}
build gvim.athena \
--with-features=huge \
--enable-gui=athena \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --enable-cscope \
--enable-fontset \
--disable-gpm \
- --without-gnome \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --without-gnome
+
%endif
%if %{with motif}
-build gvim.motif
+build gvim.motif \
--with-features=huge \
--enable-gui=motif \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
--enable-multibyte \
- --enable-cscope \
--enable-fontset \
--disable-gpm \
- --without-gnome \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --without-gnome
+
%endif
%if %{with gtk}
@@ -709,18 +686,8 @@
--enable-gui=gtk2 \
--enable-gtk2-check \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --disable-gpm
+
%endif
%if %{with gnome}
@@ -730,18 +697,8 @@
--enable-gtk2-check \
--enable-gnome-check \
--with-x \
- %{!?with_perl:--disable-perlinterp} \
- %{?with_perl:--enable-perlinterp} \
- %{!?with_python:--disable-pythoninterp} \
- %{?with_python:--enable-pythoninterp} \
- %{!?with_ruby:--disable-rubyinterp} \
- %{?with_ruby:--enable-rubyinterp} \
- %{!?with_tcl:--disable-tclinterp} \
- %{?with_tcl:--enable-tclinterp} \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --disable-gpm
+
%endif
# vim.heavy / gvim.heavy
@@ -754,10 +711,7 @@
--enable-pythoninterp \
--enable-rubyinterp \
--enable-tclinterp \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --disable-gpm
build gvim.heavy \
--with-features=huge \
@@ -769,10 +723,8 @@
--enable-pythoninterp \
--enable-rubyinterp \
--enable-tclinterp \
- --disable-gpm \
- --enable-cscope \
- --with-tlib="ncurses -ltinfo" \
- --enable-nls
+ --disable-gpm
+
%endif
%{__make} xxd/xxd languages
@@ -1176,6 +1128,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.407.2.18 2008-05-30 05:28:08 glen
+- more options moved to common function
+
Revision 1.407.2.17 2008-05-30 04:49:42 glen
- simplify by creating build() function
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vim.spec?r1=1.407.2.17&r2=1.407.2.18&f=u
More information about the pld-cvs-commit
mailing list