Revert "net-im/tdlib: Restore shared libs"

This reverts commit cf3ba1e0a4.
This commit is contained in:
Yuri Victorovich
2025-05-10 00:44:45 -07:00
parent 593f8ff8d8
commit fecba8aecf
12 changed files with 224 additions and 192 deletions
+1 -3
View File
@@ -1,7 +1,6 @@
PORTNAME= tdlib
DISTVERSIONPREFIX= v
DISTVERSION= 1.8.48
PORTREVISION= 1
CATEGORIES= net-im devel
MAINTAINER= yuri@FreeBSD.org
@@ -16,8 +15,7 @@ USE_GITHUB= yes
GH_PROJECT= td
GH_TAGNAME= b8b08b0 # hash corresponding to 1.8.48
CMAKE_ON= TD_INSTALL_SHARED_LIBRARIES TD_INSTALL_STATIC_LIBRARIES \
BUILD_SHARED_LIBS
CMAKE_ON= TD_INSTALL_SHARED_LIBRARIES TD_INSTALL_STATIC_LIBRARIES
CMAKE_OFF= BUILD_TESTING FREEBSD_BUILD_BENCHMARKS
PLIST_SUB+= LIBVERSION=${PORTVERSION}
-92
View File
@@ -9,95 +9,3 @@
add_subdirectory(benchmark)
endif()
@@ -1148,7 +1148,7 @@ set(MEMPROF_STAT_SOURCE
# LIBRARIES
# memprof - simple library for memory usage profiling
-add_library(memprof STATIC ${MEMPROF_SOURCE})
+add_library(memprof ${MEMPROF_SOURCE})
target_include_directories(memprof PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(memprof PRIVATE tdutils)
if (MEMPROF)
@@ -1162,12 +1162,12 @@ endif()
endif()
endif()
-add_library(memprof_stat EXCLUDE_FROM_ALL STATIC ${MEMPROF_STAT_SOURCE})
+add_library(memprof_stat EXCLUDE_FROM_ALL ${MEMPROF_STAT_SOURCE})
target_include_directories(memprof_stat PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(memprof_stat PRIVATE tdutils)
-add_library(tdapi STATIC ${TL_TD_API_SOURCE})
+add_library(tdapi ${TL_TD_API_SOURCE})
target_include_directories(tdapi PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> INTERFACE $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdapi PRIVATE tdutils)
@@ -1184,7 +1184,7 @@ endif()
add_dependencies(tdapi tl_generate_common)
endif()
-add_library(tdmtproto STATIC ${TD_MTPROTO_SOURCE})
+add_library(tdmtproto ${TD_MTPROTO_SOURCE})
target_include_directories(tdmtproto PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_include_directories(tdmtproto SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
target_link_libraries(tdmtproto PUBLIC tdactor tdnet tdutils PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
@@ -1201,11 +1201,11 @@ if (MSVC AND TD_ENABLE_LTO)
# tdcore - internal TDLib interface
if (MSVC AND TD_ENABLE_LTO)
- add_library(tdcore_part1 STATIC ${TDLIB_SOURCE_PART1})
+ add_library(tdcore_part1 ${TDLIB_SOURCE_PART1})
target_include_directories(tdcore_part1 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore_part1 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
- add_library(tdcore_part2 STATIC ${TDLIB_SOURCE_PART2})
+ add_library(tdcore_part2 ${TDLIB_SOURCE_PART2})
target_include_directories(tdcore_part2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore_part2 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
@@ -1214,7 +1214,7 @@ else()
set(TD_CORE_PART_TARGETS tdcore_part1 tdcore_part2)
else()
- add_library(tdcore STATIC ${TDLIB_SOURCE})
+ add_library(tdcore ${TDLIB_SOURCE})
target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
@@ -1231,7 +1231,7 @@ endif()
endif()
endif()
-add_library(tdclient STATIC td/telegram/Client.cpp td/telegram/Client.h td/telegram/Log.cpp td/telegram/Log.h)
+add_library(tdclient td/telegram/Client.cpp td/telegram/Client.h td/telegram/Log.cpp td/telegram/Log.h)
target_include_directories(tdclient PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
)
@@ -1263,7 +1263,7 @@ endif()
endif()
# tdc - TDLib interface in pure C
-add_library(tdc STATIC EXCLUDE_FROM_ALL ${TL_C_SCHEME_SOURCE} td/telegram/td_c_client.cpp td/telegram/td_c_client.h)
+add_library(tdc EXCLUDE_FROM_ALL ${TL_C_SCHEME_SOURCE} td/telegram/td_c_client.cpp td/telegram/td_c_client.h)
target_include_directories(tdc PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
@@ -1272,7 +1272,7 @@ endif()
add_dependencies(tdc tl_generate_c)
endif()
-add_library(tdjson_private STATIC ${TL_TD_JSON_SOURCE} td/telegram/ClientJson.cpp td/telegram/ClientJson.h)
+add_library(tdjson_private ${TL_TD_JSON_SOURCE} td/telegram/ClientJson.cpp td/telegram/ClientJson.h)
target_include_directories(tdjson_private PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
@@ -1299,7 +1299,7 @@ endif()
set_target_properties(tdjson PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/tdclientjson_export_list")
endif()
-add_library(tdjson_static STATIC ${TD_JSON_SOURCE} ${TD_JSON_HEADERS})
+add_library(tdjson_static ${TD_JSON_SOURCE} ${TD_JSON_HEADERS})
target_link_libraries(tdjson_static PRIVATE tdjson_private)
target_compile_definitions(tdjson_static PUBLIC TDJSON_STATIC_DEFINE)
target_include_directories(tdjson_static PUBLIC
@@ -5,7 +5,7 @@
if (GIT_DIR STREQUAL "")
set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
- set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+ set(${_hashvar} "b8b08b0" PARENT_SCOPE)
+ set(${_hashvar} "%%COMMIT%%" PARENT_SCOPE)
return()
endif()
@@ -1,11 +0,0 @@
--- sqlite/CMakeLists.txt.orig 2025-05-09 16:44:31 UTC
+++ sqlite/CMakeLists.txt
@@ -23,7 +23,7 @@ set(SQLITE_SOURCE
# all SQLite functions are moved to namespace tdsqlite3 by `sed -Ebi 's/sqlite3([^.]|$)/td&/g' *`
-add_library(tdsqlite STATIC ${SQLITE_SOURCE})
+add_library(tdsqlite ${SQLITE_SOURCE})
target_include_directories(tdsqlite PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(tdsqlite SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
target_link_libraries(tdsqlite PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
@@ -1,11 +0,0 @@
--- tdactor/CMakeLists.txt.orig 2025-05-09 16:50:48 UTC
+++ tdactor/CMakeLists.txt
@@ -44,7 +44,7 @@ set(TDACTOR_TEST_SOURCE
PARENT_SCOPE
)
-add_library(tdactor STATIC ${TDACTOR_SOURCE})
+add_library(tdactor ${TDACTOR_SOURCE})
target_include_directories(tdactor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(tdactor PUBLIC tdutils)
@@ -1,11 +0,0 @@
--- tddb/CMakeLists.txt.orig 2025-05-09 16:50:17 UTC
+++ tddb/CMakeLists.txt
@@ -48,7 +48,7 @@ set(TDDB_SOURCE
td/db/detail/RawSqliteDb.h
)
-add_library(tddb STATIC ${TDDB_SOURCE})
+add_library(tddb ${TDDB_SOURCE})
target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
@@ -1,11 +1,10 @@
--- tde2e/CMakeLists.txt.orig 2025-05-09 16:51:07 UTC
--- tde2e/CMakeLists.txt.orig 2025-04-30 22:25:21 UTC
+++ tde2e/CMakeLists.txt
@@ -62,7 +62,7 @@ set(TDE2E_TEST_SOURCE "${TDE2E_TEST_SOURCE}" PARENT_SC
set(TDE2E_TEST_SOURCE "${TDE2E_TEST_SOURCE}" PARENT_SCOPE)
-add_library(tde2e STATIC ${TDE2E_SOURCE})
+add_library(tde2e ${TDE2E_SOURCE})
if (NOT CMAKE_CROSSCOMPILING)
add_dependencies(tde2e tl_generate_common)
@@ -83,4 +83,7 @@ if (TDE2E_ENABLE_INSTALL)
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h")
endif()
@@ -1,11 +0,0 @@
--- tdnet/CMakeLists.txt.orig 2025-05-09 16:51:47 UTC
+++ tdnet/CMakeLists.txt
@@ -60,7 +60,7 @@ endif()
set_source_files_properties(td/net/DarwinHttp.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
endif()
-add_library(tdnet STATIC ${TDNET_SOURCE})
+add_library(tdnet ${TDNET_SOURCE})
target_include_directories(tdnet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(tdnet SYSTEM PRIVATE $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>)
target_link_libraries(tdnet PUBLIC tdutils tdactor)
@@ -1,9 +0,0 @@
--- tdtl/CMakeLists.txt.orig 2025-05-09 16:52:10 UTC
+++ tdtl/CMakeLists.txt
@@ -24,5 +24,5 @@ set(TDTL_SOURCE
td/tl/tl_writer.h
)
-add_library(tdtl STATIC ${TDTL_SOURCE})
+add_library(tdtl ${TDTL_SOURCE})
target_include_directories(tdtl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
@@ -1,11 +1,12 @@
--- tdutils/CMakeLists.txt.orig 2025-05-09 16:51:24 UTC
--- tdutils/CMakeLists.txt.orig 2025-04-30 22:25:21 UTC
+++ tdutils/CMakeLists.txt
@@ -351,7 +351,7 @@ set(TDUTILS_TEST_SOURCE
PARENT_SCOPE
)
@@ -416,6 +416,9 @@ if (TDUTILS_ENABLE_INSTALL)
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.h")
endif()
-add_library(tdutils STATIC ${TDUTILS_SOURCE})
+add_library(tdutils ${TDUTILS_SOURCE})
if (NOT CMAKE_CROSSCOMPILING AND TDUTILS_MIME_TYPE)
add_dependencies(tdutils tdmime_auto)
if (TD_TEST_FOLLY AND ABSL_FOUND AND TDUTILS_USE_EXTERNAL_DEPENDENCIES)
@@ -1,11 +0,0 @@
--- test/CMakeLists.txt.orig 2025-05-09 17:43:17 UTC
+++ test/CMakeLists.txt
@@ -61,7 +61,7 @@ if (NOT CMAKE_CROSSCOMPILING OR EMSCRIPTEN)
target_include_directories(run_all_tests PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(test-tdutils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_link_libraries(test-tdutils PRIVATE tdutils)
- target_link_libraries(run_all_tests PRIVATE tdcore tdclient)
+ target_link_libraries(run_all_tests PRIVATE tdcore tdclient tdmtproto)
target_link_libraries(test-online PRIVATE tdcore tdjson_private tdclient tdutils tdactor)
if (CLANG)
+204 -14
View File
@@ -1,3 +1,21 @@
include/td/e2e/BitString.h
include/td/e2e/Blockchain.h
include/td/e2e/Call.h
include/td/e2e/CheckSharedSecret.h
include/td/e2e/Container.h
include/td/e2e/DecryptedKey.h
include/td/e2e/EncryptedKey.h
include/td/e2e/EncryptedStorage.h
include/td/e2e/Keys.h
include/td/e2e/MessageEncryption.h
include/td/e2e/Mnemonic.h
include/td/e2e/QRHandshake.h
include/td/e2e/TestBlockchain.h
include/td/e2e/Trie.h
include/td/e2e/bip39.h
include/td/e2e/e2e_api.h
include/td/e2e/e2e_errors.h
include/td/e2e/utils.h
include/td/telegram/Client.h
include/td/telegram/Log.h
include/td/telegram/td_api.h
@@ -6,26 +24,198 @@ include/td/telegram/td_json_client.h
include/td/telegram/td_log.h
include/td/telegram/tdjson_export.h
include/td/tl/TlObject.h
include/td/utils/AesCtrByteFlow.h
include/td/utils/AsyncFileLog.h
include/td/utils/AtomicRead.h
include/td/utils/BigNum.h
include/td/utils/BufferedFd.h
include/td/utils/BufferedReader.h
include/td/utils/BufferedUdp.h
include/td/utils/ByteFlow.h
include/td/utils/CancellationToken.h
include/td/utils/ChainScheduler.h
include/td/utils/ChangesProcessor.h
include/td/utils/Closure.h
include/td/utils/CombinedLog.h
include/td/utils/ConcurrentHashTable.h
include/td/utils/Container.h
include/td/utils/Context.h
include/td/utils/DecTree.h
include/td/utils/Destructor.h
include/td/utils/Ed25519.h
include/td/utils/Enumerator.h
include/td/utils/EpochBasedMemoryReclamation.h
include/td/utils/ExitGuard.h
include/td/utils/FileLog.h
include/td/utils/FlatHashMap.h
include/td/utils/FlatHashMapChunks.h
include/td/utils/FlatHashSet.h
include/td/utils/FlatHashTable.h
include/td/utils/FloodControlFast.h
include/td/utils/FloodControlGlobal.h
include/td/utils/FloodControlStrict.h
include/td/utils/Gzip.h
include/td/utils/GzipByteFlow.h
include/td/utils/Hash.h
include/td/utils/HashMap.h
include/td/utils/HashSet.h
include/td/utils/HashTableUtils.h
include/td/utils/HazardPointers.h
include/td/utils/Heap.h
include/td/utils/Hints.h
include/td/utils/HttpDate.h
include/td/utils/HttpUrl.h
include/td/utils/JsonBuilder.h
include/td/utils/List.h
include/td/utils/MapNode.h
include/td/utils/MemoryLog.h
include/td/utils/MimeType.h
include/td/utils/MovableValue.h
include/td/utils/MpmcQueue.h
include/td/utils/MpmcWaiter.h
include/td/utils/MpscLinkQueue.h
include/td/utils/MpscPollableQueue.h
include/td/utils/Named.h
include/td/utils/NullLog.h
include/td/utils/ObjectPool.h
include/td/utils/Observer.h
include/td/utils/OptionParser.h
include/td/utils/OrderedEventsProcessor.h
include/td/utils/Parser.h
include/td/utils/PathView.h
include/td/utils/Promise.h
include/td/utils/Random.h
include/td/utils/ScopeGuard.h
include/td/utils/SetNode.h
include/td/utils/SharedObjectPool.h
include/td/utils/SharedSlice.h
include/td/utils/Slice-decl.h
include/td/utils/Slice.h
include/td/utils/SliceBuilder.h
include/td/utils/Span.h
include/td/utils/SpinLock.h
include/td/utils/StackAllocator.h
include/td/utils/Status.h
include/td/utils/StealingQueue.h
include/td/utils/Storer.h
include/td/utils/StorerBase.h
include/td/utils/StringBuilder.h
include/td/utils/ThreadLocalStorage.h
include/td/utils/ThreadSafeCounter.h
include/td/utils/Time.h
include/td/utils/TimedStat.h
include/td/utils/Timer.h
include/td/utils/TlDowncastHelper.h
include/td/utils/TlStorerToString.h
include/td/utils/TsCerr.h
include/td/utils/TsFileLog.h
include/td/utils/TsList.h
include/td/utils/TsLog.h
include/td/utils/UInt.h
include/td/utils/Variant.h
include/td/utils/VectorQueue.h
include/td/utils/WaitFreeHashMap.h
include/td/utils/WaitFreeHashSet.h
include/td/utils/WaitFreeVector.h
include/td/utils/algorithm.h
include/td/utils/as.h
include/td/utils/base64.h
include/td/utils/benchmark.h
include/td/utils/bits.h
include/td/utils/buffer.h
include/td/utils/check.h
include/td/utils/common.h
include/td/utils/crypto.h
include/td/utils/emoji.h
include/td/utils/filesystem.h
include/td/utils/find_boundary.h
include/td/utils/fixed_vector.h
include/td/utils/format.h
include/td/utils/int_types.h
include/td/utils/invoke.h
include/td/utils/logging.h
include/td/utils/misc.h
include/td/utils/optional.h
include/td/utils/overloaded.h
include/td/utils/port/Clocks.h
include/td/utils/port/CxCli.h
include/td/utils/port/EventFd.h
include/td/utils/port/EventFdBase.h
include/td/utils/port/FileFd.h
include/td/utils/port/FromApp.h
include/td/utils/port/IPAddress.h
include/td/utils/port/IoSlice.h
include/td/utils/port/MemoryMapping.h
include/td/utils/port/Mutex.h
include/td/utils/port/Poll.h
include/td/utils/port/PollBase.h
include/td/utils/port/PollFlags.h
include/td/utils/port/RwMutex.h
include/td/utils/port/ServerSocketFd.h
include/td/utils/port/SocketFd.h
include/td/utils/port/Stat.h
include/td/utils/port/StdStreams.h
include/td/utils/port/UdpSocketFd.h
include/td/utils/port/config.h
include/td/utils/port/detail/Epoll.h
include/td/utils/port/detail/EventFdBsd.h
include/td/utils/port/detail/EventFdLinux.h
include/td/utils/port/detail/EventFdWindows.h
include/td/utils/port/detail/Iocp.h
include/td/utils/port/detail/KQueue.h
include/td/utils/port/detail/NativeFd.h
include/td/utils/port/detail/Poll.h
include/td/utils/port/detail/PollableFd.h
include/td/utils/port/detail/Select.h
include/td/utils/port/detail/ThreadIdGuard.h
include/td/utils/port/detail/ThreadPthread.h
include/td/utils/port/detail/ThreadStl.h
include/td/utils/port/detail/WineventPoll.h
include/td/utils/port/detail/skip_eintr.h
include/td/utils/port/path.h
include/td/utils/port/platform.h
include/td/utils/port/rlimit.h
include/td/utils/port/signals.h
include/td/utils/port/sleep.h
include/td/utils/port/stacktrace.h
include/td/utils/port/thread.h
include/td/utils/port/thread_local.h
include/td/utils/port/uname.h
include/td/utils/port/user.h
include/td/utils/port/wstring_convert.h
include/td/utils/queue.h
include/td/utils/simple_tests.h
include/td/utils/tests.h
include/td/utils/tl_helpers.h
include/td/utils/tl_parsers.h
include/td/utils/tl_storers.h
include/td/utils/translit.h
include/td/utils/type_traits.h
include/td/utils/uint128.h
include/td/utils/unicode.h
include/td/utils/unique_ptr.h
include/td/utils/unique_value_ptr.h
include/td/utils/utf8.h
lib/cmake/Td/TdConfig.cmake
lib/cmake/Td/TdConfigVersion.cmake
lib/cmake/Td/TdStaticTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Td/TdStaticTargets.cmake
lib/cmake/Td/TdTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Td/TdTargets.cmake
lib/libtdactor.so
lib/libtdapi.so
lib/libtdclient.so
lib/libtdcore.so
lib/libtddb.so
lib/libtde2e.so
lib/cmake/Td/TdStaticTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Td/TdStaticTargets.cmake
lib/libtdactor.a
lib/libtdapi.a
lib/libtdclient.a
lib/libtdcore.a
lib/libtddb.a
lib/libtde2e.a
lib/libtdjson.so
lib/libtdjson.so.%%LIBVERSION%%
lib/libtdjson_private.so
lib/libtdjson_static.so
lib/libtdmtproto.so
lib/libtdnet.so
lib/libtdsqlite.so
lib/libtdutils.so
lib/libtdjson_private.a
lib/libtdjson_static.a
lib/libtdmtproto.a
lib/libtdnet.a
lib/libtdsqlite.a
lib/libtdutils.a
libdata/pkgconfig/tdactor.pc
libdata/pkgconfig/tdapi.pc
libdata/pkgconfig/tdclient.pc