redhat: remove support for static builds

This just doesn't work as RHEL doesn't ship static libs for the
dependencies.

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
This commit is contained in:
Ruben Kerkhof 2018-06-20 15:39:02 +02:00
parent 7bd661a2b5
commit 5c3ad1d46a

View File

@ -18,7 +18,6 @@
%{!?with_nhrpd: %global with_nhrpd 1 } %{!?with_nhrpd: %global with_nhrpd 1 }
%{!?with_eigrpd: %global with_eigrpd 1 } %{!?with_eigrpd: %global with_eigrpd 1 }
%{!?with_babeld: %global with_babeld 1 } %{!?with_babeld: %global with_babeld 1 }
%{!?with_shared: %global with_shared 1 }
%{!?with_multipath: %global with_multipath 256 } %{!?with_multipath: %global with_multipath 256 }
%{!?frr_user: %global frr_user frr } %{!?frr_user: %global frr_user frr }
%{!?vty_group: %global vty_group frrvty } %{!?vty_group: %global vty_group frrvty }
@ -237,11 +236,9 @@ developing OSPF-API and frr applications.
--sbindir=%{_sbindir} \ --sbindir=%{_sbindir} \
--sysconfdir=%{configdir} \ --sysconfdir=%{configdir} \
--localstatedir=%{rundir} \ --localstatedir=%{rundir} \
--disable-static \
--disable-werror \ --disable-werror \
--enable-irdp \ --enable-irdp \
%if !%{with_shared}
--disable-shared \
%endif
%if %{with_multipath} %if %{with_multipath}
--enable-multipath=%{with_multipath} \ --enable-multipath=%{with_multipath} \
%endif %endif
@ -343,8 +340,9 @@ rm -rf %{buildroot}/usr/share/info/dir
# Remove debian init script if it was installed # Remove debian init script if it was installed
rm -f %{buildroot}%{_sbindir}/frr rm -f %{buildroot}%{_sbindir}/frr
# kill bogus libtool files for modules # kill bogus libtool files
rm -f %{buildroot}%{_libdir}/frr/modules/*.la rm -vf %{buildroot}%{_libdir}/frr/modules/*.la
rm -vf %{buildroot}%{_libdir}/*.la
# install /etc sources # install /etc sources
%if "%{initsystem}" == "systemd" %if "%{initsystem}" == "systemd"
@ -571,11 +569,9 @@ fi
%if %{with_babeld} %if %{with_babeld}
%{_sbindir}/babeld %{_sbindir}/babeld
%endif %endif
%if %{with_shared} %{_libdir}/lib*.so
%{_libdir}/lib*.so %{_libdir}/lib*.so.0
%{_libdir}/lib*.so.0 %attr(755,root,root) %{_libdir}/lib*.so.0.*
%attr(755,root,root) %{_libdir}/lib*.so.0.*
%endif
%if %{with_fpm} %if %{with_fpm}
%attr(755,root,root) %{_libdir}/frr/modules/zebra_fpm.so %attr(755,root,root) %{_libdir}/frr/modules/zebra_fpm.so
%endif %endif
@ -608,8 +604,6 @@ fi
%if %{with_ospfclient} %if %{with_ospfclient}
%{_sbindir}/ospfclient %{_sbindir}/ospfclient
%endif %endif
%{_libdir}/*.a
%{_libdir}/*.la
%dir %attr(755,root,root) %{_includedir}/%{name} %dir %attr(755,root,root) %{_includedir}/%{name}
%{_includedir}/%name/*.h %{_includedir}/%name/*.h
%dir %attr(755,root,root) %{_includedir}/%{name}/ospfd %dir %attr(755,root,root) %{_includedir}/%{name}/ospfd