Add hiredis build for flexisip.

This ensures that we have the correct version when runnning. Debian 7, for instance, doesn't provide a recent enough hiredis.

builders/CMakeLists.txt

@@ -193,6 +193,7 @@ else()
 		linphone_builder_add_builder_to_target(TARGET_flexisip odb )
 		linphone_builder_add_builder_to_target(TARGET_flexisip libodb )
 		linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql )
+		linphone_builder_add_builder_to_target(TARGET_flexisip hiredis )
 		
 		linphone_builder_add_builder_to_target(TARGET_flexisip flexisip )
 	endif()

builders/flexisip.cmake

@@ -28,6 +28,10 @@ set(EP_flexisip_DEPENDENCIES EP_ortp EP_sofiasip )
 
 list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
 
+#if(PLATFORM STREQUAL "Debian")
+list(APPEND EP_flexisip_DEPENDENCIES EP_hiredis)  
+#endif()
+
 set(EP_flexisip_LINKING_TYPE "--disable-static" "--enable-shared")
 set(EP_flexisip_BUILD_METHOD "autotools")
 set(EP_flexisip_USE_AUTOGEN "yes")

builders/hiredis.cmake

+
+set(hiredis_filename "v0.11.0.tar.gz")
+set(EP_hiredis_URL "https://github.com/redis/hiredis/archive/${hiredis_filename}")
+set(EP_hiredis_URL_HASH "SHA1=694b6d7a6e4ea7fb20902619e9a2423c014b37c1")
+set(EP_hiredis_BUILD_METHOD "rpm")
+
+set(EP_hiredis_SPEC_FILE "hiredis.spec" )
+set(EP_hiredis_CONFIG_H_FILE "${CMAKE_CURRENT_SOURCE_DIR}/builders/hiredis/${EP_hiredis_SPEC_FILE}" )
+
+#create source dir and copy the tar.gz inside
+set(EP_hiredis_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${LINPHONE_BUILDER_WORK_DIR}/rpmbuild/SOURCES/")
+set(EP_hiredis_PATCH_COMMAND ${EP_hiredis_PATCH_COMMAND} "COMMAND" "${CMAKE_COMMAND}" "-E" "copy" "${LINPHONE_BUILDER_WORK_DIR}/Download/EP_hiredis/${hiredis_filename}" "${LINPHONE_BUILDER_WORK_DIR}/rpmbuild/SOURCES/")
+set(EP_hiredis_PATCH_COMMAND ${EP_hiredis_PATCH_COMMAND} "COMMAND" "${CMAKE_COMMAND}" "-E" "copy" ${EP_hiredis_CONFIG_H_FILE} "<BINARY_DIR>")

builders/hiredis/hiredis.spec

+
+
+%define                 pkg_name        hiredis
+%define                 finalpkg_name   %{?_with_bc:bc-%{pkg_name}}%{!?_with_bc:%{pkg_name}}
+%{?_with_bc: %define    _prefix         /opt/belledonne-communications}
+# re-define some directories for older RPMBuild versions which don't. This messes up the doc/ dir
+# taken from https://fedoraproject.org/wiki/Packaging:RPMMacros?rd=Packaging/RPMMacros
+%define _datarootdir       %{_prefix}/share
+%define _datadir           %{_datarootdir}
+%define _docdir            %{_datadir}/doc
+
+
+Name:           %{finalpkg_name}
+Version:        0.11.0
+Release:        3%{?dist}
+Summary:        Minimalistic C client library for Redis
+License:        BSD
+URL:            https://github.com/redis/hiredis
+Source0:        v%{version}.tar.gz
+
+%description 
+Hiredis is a minimalistic C client library for the Redis database.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+This package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q -n hiredis-%{version}
+
+%build
+make %{?_smp_mflags} OPTIMIZATION="%{optflags}"
+
+%install
+make install PREFIX=%{buildroot}%{_prefix} INSTALL_LIBRARY_PATH=%{buildroot}%{_libdir}
+
+mkdir -p %{buildroot}%{_bindir}
+cp hiredis-example %{buildroot}%{_bindir}
+cp hiredis-test    %{buildroot}%{_bindir}
+
+find %{buildroot} -name '*.a' -delete -print
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%doc COPYING
+%{_bindir}/hiredis-example
+%{_bindir}/hiredis-test
+%{_libdir}/libhiredis.so.0.10
+%{_libdir}/libhiredis.so.0
+
+%files devel
+%doc README.md
+%{_includedir}/%{pkg_name}/
+%{_libdir}/libhiredis.so
+
+%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Sep 29 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.11.0-1
+- Updated to 0.11.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 20 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.10.1-3
+- Removed Requires redis.
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Dec 30 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.10.1-1
+- Updated to upstream 0.10.1-28-gd5d8843.
+
+* Mon May 16 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.10.0-3
+- Removed INSTALL_LIB from install target as we use INSTALL_LIBRARY_PATH.
+- Use 'client library' in Summary.
+
+* Wed May 11 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.10.0-2
+- Updated devel sub-package description.
+- Added optimization flags.
+- Remove manual installation of shared objects.
+- Use upstream .tar.gz sources.
+
+* Tue May 10 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.10.0-1.gitdf203bc328
+- Updated to upstream gitdf203bc328.
+- Added TODO to the files.
+- Updated to use libhiredis.so.0, libhiredis.so.0.10.
+
+* Tue Apr 29 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> 0.9.2-1
+- First release.

configs/config-flexisip-rpm.cmake

@@ -132,7 +132,7 @@ set(EP_ortp_RPMBUILD_OPTIONS      "--with bc --without srtp")
 set(EP_unixodbc_RPMBUILD_OPTIONS  "--with bc")
 set(EP_myodbc_RPMBUILD_OPTIONS    "--with bc")
 set(EP_sofiasip_RPMBUILD_OPTIONS  "--with bc --without glib")
-
+set(EP_hiredis_RPMBUILD_OPTIONS   "--with bc" )
 set(EP_flexisip_RPMBUILD_OPTIONS  "--with bc --without transcoder --without boostlog --with push")
 
 if( USE_BC_ODBC )