Skip to content

[qt5,sqlite3] Fix missing pthread flags #46485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 2 commits into from
Jul 26, 2025
Merged

[qt5,sqlite3] Fix missing pthread flags #46485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2730f
[sqlite3] Fix missing -pthread flag in pkgconfig Cflags
Jul 21, 2025
5b54ef3
[qt5-base] Change LIBRARIES to LIBS in x_vcpkg_pkgconfig_get_modules
Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions ports/qt5-base/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,41 +212,41 @@ set(DEBUG_OPTIONS
"QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG} ${ZLIB_DEBUG}"
)

x_vcpkg_pkgconfig_get_modules(PREFIX freetype MODULES freetype2 LIBRARIES)
x_vcpkg_pkgconfig_get_modules(PREFIX freetype MODULES freetype2 LIBS)
list(APPEND CORE_OPTIONS -system-freetype)
list(APPEND RELEASE_OPTIONS "FREETYPE_LIBS=${freetype_LIBRARIES_RELEASE}")
list(APPEND DEBUG_OPTIONS "FREETYPE_LIBS=${freetype_LIBRARIES_DEBUG}")
list(APPEND RELEASE_OPTIONS "FREETYPE_LIBS=${freetype_LIBS_RELEASE}")
list(APPEND DEBUG_OPTIONS "FREETYPE_LIBS=${freetype_LIBS_DEBUG}")

x_vcpkg_pkgconfig_get_modules(PREFIX harfbuzz MODULES harfbuzz LIBRARIES)
x_vcpkg_pkgconfig_get_modules(PREFIX harfbuzz MODULES harfbuzz LIBS)
if(VCPKG_TARGET_IS_OSX)
string(APPEND harfbuzz_LIBRARIES_RELEASE " -framework ApplicationServices")
string(APPEND harfbuzz_LIBRARIES_DEBUG " -framework ApplicationServices")
endif()
list(APPEND CORE_OPTIONS -system-harfbuzz)
list(APPEND RELEASE_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}")
list(APPEND DEBUG_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}")
list(APPEND RELEASE_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBS_RELEASE}")
list(APPEND DEBUG_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBS_DEBUG}")

if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND CORE_OPTIONS -fontconfig)
x_vcpkg_pkgconfig_get_modules(PREFIX fontconfig MODULES fontconfig LIBRARIES)
list(APPEND RELEASE_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBRARIES_RELEASE}")
list(APPEND DEBUG_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBRARIES_DEBUG}")
x_vcpkg_pkgconfig_get_modules(PREFIX fontconfig MODULES fontconfig LIBS)
list(APPEND RELEASE_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBS_RELEASE}")
list(APPEND DEBUG_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBS_DEBUG}")
endif()

if("sqlite3plugin" IN_LIST FEATURES)
list(APPEND CORE_OPTIONS -system-sqlite)
x_vcpkg_pkgconfig_get_modules(PREFIX sqlite3 MODULES sqlite3 LIBRARIES)
list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${sqlite3_LIBRARIES_RELEASE}")
list(APPEND DEBUG_OPTIONS "SQLITE_LIBS=${sqlite3_LIBRARIES_DEBUG}")
x_vcpkg_pkgconfig_get_modules(PREFIX sqlite3 MODULES sqlite3 LIBS)
list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${sqlite3_LIBS_RELEASE}")
list(APPEND DEBUG_OPTIONS "SQLITE_LIBS=${sqlite3_LIBS_DEBUG}")
else()
list(APPEND CORE_OPTIONS -no-sql-sqlite)
endif()

if("zstd" IN_LIST FEATURES)
list(APPEND CORE_OPTIONS -zstd)
x_vcpkg_pkgconfig_get_modules(PREFIX libzstd MODULES libzstd LIBRARIES)
list(APPEND RELEASE_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBRARIES_RELEASE}")
list(APPEND DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBRARIES_DEBUG}")
x_vcpkg_pkgconfig_get_modules(PREFIX libzstd MODULES libzstd LIBS)
list(APPEND RELEASE_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBS_RELEASE}")
list(APPEND DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBS_DEBUG}")
else()
list(APPEND CORE_OPTIONS -no-zstd)
endif()
Expand Down
2 changes: 2 additions & 0 deletions ports/sqlite3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF)

set(PKGCONFIG_LIBS_PRIVATE "")
set(PKGCONFIG_REQUIRES_PRIVATE "")
set(PKGCONFIG_CFLAGS "")

add_library(sqlite3 sqlite3.c sqlite3.rc)

Expand All @@ -33,6 +34,7 @@ if (NOT WIN32)
find_package(Threads REQUIRED)
target_link_libraries(sqlite3 PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
string(APPEND PKGCONFIG_LIBS_PRIVATE " -pthread")
string(APPEND PKGCONFIG_CFLAGS " -pthread")
foreach(LIB IN LISTS CMAKE_DL_LIBS)
string(APPEND PKGCONFIG_LIBS_PRIVATE " -l${LIB}")
endforeach()
Expand Down
2 changes: 1 addition & 1 deletion ports/sqlite3/sqlite3.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Version: @PKGCONFIG_VERSION@
Libs: -L${libdir} -lsqlite3
Libs.private: @PKGCONFIG_LIBS_PRIVATE@
Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
Cflags: -I${includedir}
Cflags: -I${includedir} @PKGCONFIG_CFLAGS@
2 changes: 1 addition & 1 deletion versions/q-/qt5-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "e2c35de318d30fc18437711fc0b0e6fdd9f6bb90",
"git-tree": "d58cac448df90554ba032b788cc4cdf3fd8538d8",
"version": "5.15.17",
"port-version": 0
},
Expand Down
2 changes: 1 addition & 1 deletion versions/s-/sqlite3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "31b40b0331963abeb58583e1616c9ac80b972486",
"git-tree": "a9b96b5247b84b5ed31414f50c9a95492fe11720",
"version": "3.50.3",
"port-version": 0
},
Expand Down