Working version for deb build.

Makefile

@@ -66,10 +66,9 @@ build-flexisip-rpm:
 #	make -j $(NUMCPUS)
 	
 clean-flexisip-rpm:
-	rm -rf WORK/tmp-flexisip-rpm && \
+	rm -rf WORK/tmp-flexisip-rpm
 	rm -rf WORK/Build-flexisip-rpm
 # needed: ?
-#	rm -rf WORK/Build-flexisip-rpm && \
 #	rm -rf WORK/rpmbuild/RPMS/*
 
 build-bb10-i486:

builders/flexisip.cmake

@@ -21,7 +21,7 @@
 ############################################################################
 
 set(EP_flexisip_GIT_REPOSITORY "gitosis@git.linphone.org:flexisip")
-set(EP_flexisip_GIT_TAG "master")
+set(EP_flexisip_GIT_TAG "487226847780845a3fa8c6494da9b8ba1897bb1c")
 
 set(EP_flexisip_DEPENDENCIES EP_ortp EP_unixodbc EP_myodbc EP_sofiasip )
 set(EP_flexisip_LINKING_TYPE "--disable-static" "--enable-shared")

builders/myodbc.cmake

@@ -21,7 +21,7 @@
 ############################################################################
 
 set(EP_myodbc_GIT_REPOSITORY "git://git.linphone.org/myodbc.git")
-set(EP_myodbc_GIT_TAG "83cdc8563b101ad19abcec051ee940cd499e7944")
+set(EP_myodbc_GIT_TAG "1b9b0222e71432b067445dfb46858b5bdf1fe701")
 
 set(EP_myodbc_CMAKE_OPTIONS "-DWITH_UNIXODBC=1")
 set(EP_myodbc_LINKING_TYPE )

builders/ortp.cmake

@@ -24,7 +24,7 @@ set(EP_ortp_GIT_REPOSITORY "git://git.linphone.org/ortp.git")
 if(LINPHONE_BUILDER_LATEST)
 	set(EP_ortp_GIT_TAG "master")
 else()
-	set(EP_ortp_GIT_TAG "90a19604d061d7f23189feb925847e66d366898e")
+	set(EP_ortp_GIT_TAG "3da8e491d4553cca3f9fa0b1a7a712af85f72056")
 endif()
 
 if("${EP_ortp_FORCE_AUTOTOOLS}" STREQUAL "yes")

cmake/configure.rpm.sh.cmake

@@ -32,10 +32,11 @@ done
 
 if [ ! -f @ep_config_h_file@ ]
 then
-	@ep_autogen_command@ @ep_autogen_redirect_to_file@
+ 	@ep_autogen_command@ @ep_autogen_redirect_to_file@
 	@ep_configure_env@ @ep_configure_command@ @ep_configure_redirect_to_file@
 	make dist V=@AUTOTOOLS_VERBOSE_MAKEFILE@ @ep_redirect_to_file@
 	cp *.tar.gz "$RPM_TOPDIR/SOURCES"
 	@LINPHONE_BUILDER_CONFIGURE_EXTRA_CMD@
-	touch @ep_config_h_file@
+#	touch @ep_config_h_file@
+
 fi

cmake/install.rpm.sh.cmake

@@ -23,10 +23,11 @@ export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
 export RPM_TOPDIR="@LINPHONE_BUILDER_WORK_DIR@/rpmbuild"
 
 if [[ "@PLATFORM@" -eq "Debian" ]]; then
-	cd "$RPM_TOPDIR/RPMS"
-	find "$RPM_TOPDIR/RPMS" -name "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.rpm" -exec fakeroot alien -d {} +
-	find "$RPM_TOPDIR/RPMS" -name "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.deb" -exec sudo dpkg -i {} +
+	DEBS_TOPDIR="$RPM_TOPDIR/DEBS"
+	mkdir -p "$DEBS_TOPDIR" && cd "$DEBS_TOPDIR"
+	find "$RPM_TOPDIR/RPMS" -iname "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.rpm" -exec fakeroot alien -d {} +
+	find "$DEBS_TOPDIR" -iname "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.deb" -exec sudo dpkg -i {} +
 else
-	find "$RPM_TOPDIR/RPMS" -name "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.rpm" -exec sudo rpm -ivh --force {} +
+	find "$RPM_TOPDIR/RPMS" -iname "*@LINPHONE_BUILDER_RPMBUILD_NAME@*.rpm" -exec sudo rpm -ivh --force {} +
 	#sudo rpm -ivh WORK/rpmbuild/RPMS/x86_64/*.rpm --force
 fi

configs/config-flexisip-rpm.cmake

@@ -59,25 +59,29 @@ if(APPLE)
 	set(LINPHONE_BUILDER_LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
 endif(APPLE)
 
+set(RPM_INSTALL_PREFIX "/opt/belledonne-communications")
+
 # Adjust PKG_CONFIG_PATH to include install directory
 if(UNIX)
-	set(LINPHONE_BUILDER_PKG_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:$ENV{PKG_CONFIG_PATH}:/usr/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:/usr/${CMAKE_INSTALL_LIBDIR}/x86_64-linux-gnu/pkgconfig/:/usr/share/pkgconfig/:/usr/local/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:/opt/local/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+	set(LINPHONE_BUILDER_PKG_CONFIG_PATH "${RPM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:$ENV{PKG_CONFIG_PATH}:/usr/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:/usr/${CMAKE_INSTALL_LIBDIR}/x86_64-linux-gnu/pkgconfig/:/usr/share/pkgconfig/:/usr/local/${CMAKE_INSTALL_LIBDIR}/pkgconfig/:/opt/local/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+	message(STATUS "PKG CONFIG PATH: ${LINPHONE_BUILDER_PKG_CONFIG_PATH}")
+	message(STATUS "LIBDIR: ${LIBDIR}")
 else() # Windows
 	set(LINPHONE_BUILDER_PKG_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/")
 endif()
 
+# needed *before* the include 
 set(EP_ortp_FORCE_AUTOTOOLS "yes")
+
 # Include builders
 include(builders/CMakeLists.txt)
 
 
-set(RPM_INSTALL_PREFIX "/opt/belledonne-communications")
-
 set(EP_ortp_GIT_TAG "master")
 
-set(EP_ortp_BUILD_METHOD "rpm")
+set(EP_ortp_BUILD_METHOD     "rpm")
 set(EP_unixodbc_BUILD_METHOD "rpm")
-set(EP_myodbc_BUILD_METHOD "rpm")
+set(EP_myodbc_BUILD_METHOD   "rpm")
 set(EP_sofiasip_BUILD_METHOD "rpm")
 set(EP_flexisip_BUILD_METHOD "rpm")
 
@@ -100,5 +104,5 @@ message( STATUS "PLATFORM is ${PLATFORM}")
 message( STATUS "SYSTEM is ${CMAKE_SYSTEM}")
 
 if(PLATFORM STREQUAL "Debian")
-	set(LINPHONE_BUILDER_RPMBUILD_GLOBAL_OPTION "--nodeps")
+	set(LINPHONE_BUILDER_RPMBUILD_GLOBAL_OPTION "--nodeps --define 'dist deb' --define '_libdir %{_prefix}/${CMAKE_INSTALL_LIBDIR}'")
 endif()
\ No newline at end of file