Remove all LIBxxx_VERSION hacks, cmake.mk can cope that now
This commit is contained in:
parent
0413f71e64
commit
301cefb6f4
@ -20,9 +20,6 @@ WANTLIB += ${COMPILER_LIBCXX} execinfo iconv m mbedcrypto mbedtls mbedx509
|
||||
#LIB_DEPENDS += telephony/linphone/bcunit
|
||||
#WANTLIB += bcunit
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/CMakeLists.txt
|
||||
|
||||
#do-test:
|
||||
# ${WRKBUILD}/tester/bctoolbox_tester --verbose
|
||||
|
||||
|
@ -3,17 +3,6 @@ Hunk #3: ensure that libexecinfo symbols are resolved (fix the build on ld.bfd a
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -29,8 +29,8 @@ set(BCTOOLBOX_VERSION "${PROJECT_VERSION}")
|
||||
set(BCTOOLBOX_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
|
||||
set(BCTOOLBOX_VERSION_MINOR ${PROJECT_VERSION_MINOR})
|
||||
set(BCTOOLBOX_VERSION_PATCH ${PROJECT_VERSION_PATCH})
|
||||
-set(BCTOOLBOX_SO_VERSION 1)
|
||||
-set(BCTOOLBOXTESTER_SO_VERSION 1)
|
||||
+set(BCTOOLBOX_SO_VERSION ${LIBbctoolbox_VERSION})
|
||||
+set(BCTOOLBOXTESTER_SO_VERSION ${LIBbctoolbox_VERSION})
|
||||
|
||||
|
||||
option(ENABLE_SHARED "Build shared library." ON)
|
||||
@@ -60,9 +60,7 @@ if(NOT CPACK_GENERATOR AND NOT CMAKE_INSTALL_RPATH AND
|
||||
message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
|
||||
endif()
|
||||
|
@ -15,7 +15,4 @@ WANTLIB += ${COMPILER_LIBCXX} bctoolbox m
|
||||
|
||||
NO_TESTS = Yes
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/BCUnit/Sources/CMakeLists.txt
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: BCUnit/Sources/CMakeLists.txt
|
||||
--- BCUnit/Sources/CMakeLists.txt.orig
|
||||
+++ BCUnit/Sources/CMakeLists.txt
|
||||
@@ -176,7 +176,7 @@ if(ENABLE_STATIC)
|
||||
endif()
|
||||
if(ENABLE_SHARED)
|
||||
add_library(bcunit SHARED ${SOURCE_FILES})
|
||||
- set_target_properties(bcunit PROPERTIES VERSION 1.0.1)
|
||||
+ set_target_properties(bcunit PROPERTIES VERSION ${LIBbcunit_VERSION})
|
||||
target_include_directories(bcunit PUBLIC
|
||||
$<INSTALL_INTERFACE:include>
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/BCUnit/Headers/>
|
@ -12,9 +12,6 @@ LIB_DEPENDS = telephony/linphone/bctoolbox \
|
||||
telephony/linphone/belr
|
||||
WANTLIB += ${COMPILER_LIBCXX} bctoolbox belr m z
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
|
||||
|
||||
#do-test:
|
||||
# ${WRKBUILD}/tester/belle_sip_tester --verbose --resource-dir ${WRKSRC}/tester/
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ set(PACKAGE_BUGREPORT "jehan.monnier@linphone.org")
|
||||
set(PACKAGE_TARNAME "${PROJECT_NAME}")
|
||||
set(PACKAGE_URL "")
|
||||
set(VERSION "${PACKAGE_VERSION}")
|
||||
-set(BELLESIP_SO_VERSION 1) # set for 4.4.0 release.
|
||||
+set(BELLESIP_SO_VERSION ${LIBbellesip_VERSION}) # set for 4.4.0 release.
|
||||
|
||||
|
||||
option(ENABLE_SHARED "Build shared library." YES)
|
@ -14,7 +14,4 @@ WANTLIB += ${COMPILER_LIBCXX} bctoolbox c m
|
||||
|
||||
FIX_CRLF_FILES = CMakeLists.txt
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -23,7 +23,7 @@
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
project(BELR VERSION 5.0.0 LANGUAGES C CXX)
|
||||
|
||||
-set(BELR_SO_VERSION "1")
|
||||
+set(BELR_SO_VERSION ${LIBbelr_VERSION})
|
||||
|
||||
option(ENABLE_SHARED "Build shared library." ON)
|
||||
option(ENABLE_STATIC "Build static library." ON)
|
@ -28,9 +28,6 @@ WANTLIB += ${COMPILER_LIBCXX} bctoolbox belcard bellesip belr
|
||||
WANTLIB += bzrtp c iconv m mediastreamer ortp sqlite3 xerces-c
|
||||
WANTLIB += xml2 z
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
|
||||
|
||||
post-install:
|
||||
mv ${PREFIX}/share/doc/liblinphone-5.0.0 ${PREFIX}/share/doc/liblinphone
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
|
||||
set(LINPHONE_MINOR_VERSION ${PROJECT_VERSION_MINOR})
|
||||
set(LINPHONE_MICRO_VERSION ${PROJECT_VERSION_PATCH})
|
||||
set(LINPHONE_VERSION ${PROJECT_VERSION})
|
||||
-set(LINPHONE_SO_VERSION "10") #incremented for 4.4.0 release.
|
||||
+set(LINPHONE_SO_VERSION ${LIBlinphone_VERSION}) #incremented for 4.4.0 release.
|
||||
|
||||
file(GLOB LINPHONE_PO_FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}/po" "${CMAKE_CURRENT_LIST_DIR}/po/*.po")
|
||||
string(REGEX REPLACE "([a-zA-Z_]+)\\.po" "\\1" LINPHONE_ALL_LANGS_LIST "${LINPHONE_PO_FILES}")
|
@ -1,15 +1,6 @@
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -38,7 +38,7 @@ set(MEDIASTREAMER_MAJOR_VERSION ${PROJECT_VERSION_MAJO
|
||||
set(MEDIASTREAMER_MINOR_VERSION ${PROJECT_VERSION_MINOR})
|
||||
set(MEDIASTREAMER_MICRO_VERSION ${PROJECT_VERSION_PATCH})
|
||||
set(MEDIASTREAMER_VERSION ${PROJECT_VERSION})
|
||||
-set(MEDIASTREAMER_SO_VERSION "11") # incremented for mediastreamer2-4.4.0
|
||||
+set(MEDIASTREAMER_SO_VERSION ${LIBmediastreamer_VERSION}) # incremented for mediastreamer2-4.4.0
|
||||
|
||||
string(REGEX MATCH "^(arm*|aarch64)" FIXED_POINT_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
|
||||
if(FIXED_POINT_PROCESSOR)
|
||||
@@ -95,6 +95,7 @@ cmake_dependent_option(ENABLE_QSA "Enable QSA (QNX Sou
|
||||
cmake_dependent_option(ENABLE_OSS "Enable OSS support." NO "ENABLE_SOUND;LINUX_OR_BSD" NO)
|
||||
cmake_dependent_option(ENABLE_PORTAUDIO "Enable portaudio native support." NO "ENABLE_SOUND" NO)
|
||||
|
@ -12,9 +12,6 @@ LIB_DEPENDS = telephony/linphone/bctoolbox
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} bctoolbox m
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
|
||||
|
||||
post-install:
|
||||
rm -Rf ${PREFIX}/share/doc/ortp*
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ set(ORTP_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
|
||||
set(ORTP_MINOR_VERSION ${PROJECT_VERSION_MINOR})
|
||||
set(ORTP_MICRO_VERSION ${PROJECT_VERSION_PATCH})
|
||||
set(ORTP_VERSION ${PROJECT_VERSION})
|
||||
-set(ORTP_SO_VERSION "15") # incremented for 4.4.0 version.
|
||||
+set(ORTP_SO_VERSION ${LIBortp_VERSION}) # incremented for 4.4.0 version.
|
||||
set(ORTP_DOC_VERSION "${ORTP_VERSION_MAJOR}.${ORTP_VERSION_MINOR}")
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user