Commit ae379c6c authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI
Browse files

Fix rpmbuild shell on debian and mysql search fail on centos

parent 324efe46
...@@ -39,6 +39,7 @@ ENDFUNCTION() ...@@ -39,6 +39,7 @@ ENDFUNCTION()
FUNCTION(CHECK_LIBRARY libname) FUNCTION(CHECK_LIBRARY libname)
find_library(${libname}_LIBRARY find_library(${libname}_LIBRARY
NAMES ${libname} NAMES ${libname}
PATHS /usr/lib/mysql/
) )
if(NOT ${libname}_LIBRARY) if(NOT ${libname}_LIBRARY)
message(FATAL_ERROR "Could not find the ${libname} library, which is needed for RPMBuild of flexisip") message(FATAL_ERROR "Could not find the ${libname} library, which is needed for RPMBuild of flexisip")
...@@ -142,7 +143,7 @@ message( STATUS "PLATFORM is ${PLATFORM}") ...@@ -142,7 +143,7 @@ message( STATUS "PLATFORM is ${PLATFORM}")
message( STATUS "SYSTEM is ${CMAKE_SYSTEM}") message( STATUS "SYSTEM is ${CMAKE_SYSTEM}")
if(PLATFORM STREQUAL "Debian") if(PLATFORM STREQUAL "Debian")
set(LINPHONE_BUILDER_RPMBUILD_GLOBAL_OPTION "--nodeps --define 'dist deb' --define '_libdir %{_prefix}/${CMAKE_INSTALL_LIBDIR}'") set(LINPHONE_BUILDER_RPMBUILD_GLOBAL_OPTION "--nodeps --define 'dist deb' --define '_libdir %{_prefix}/${CMAKE_INSTALL_LIBDIR}' --define '_buildshell /bin/bash'")
CHECK_PROGRAM(alien) CHECK_PROGRAM(alien)
CHECK_PROGRAM(fakeroot) CHECK_PROGRAM(fakeroot)
endif() endif()
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment