From 8d44ae5d7e475e8cc830d42b5253e4bd77156bca Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 7 May 2021 14:33:01 +0200 Subject: [PATCH] sqlite: Fix qbs build Change-Id: I919fd20c445510231e66c08d3dafd5c1b5696ac7 Reviewed-by: Christian Stenger --- qbs/modules/sqlite_sources/sqlite-sources.qbs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/qbs/modules/sqlite_sources/sqlite-sources.qbs b/qbs/modules/sqlite_sources/sqlite-sources.qbs index ea80e58b1bd..67e547bbeb3 100644 --- a/qbs/modules/sqlite_sources/sqlite-sources.qbs +++ b/qbs/modules/sqlite_sources/sqlite-sources.qbs @@ -8,9 +8,18 @@ Module { Depends { name: "cpp" } - cpp.defines: [ - "_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE" - ].concat(buildSharedLib ? "BUILD_SQLITE_LIBRARY" : "BUILD_SQLITE_STATIC_LIBRARY") + cpp.defines: { + var defines = ["_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE"]; + if (buildSharedLib) + defines.push("BUILD_SQLITE_LIBRARY"); + else + defines.push("BUILD_SQLITE_STATIC_LIBRARY"); + if (qbs.targetOS.contains("linux")) + defines.push("_POSIX_C_SOURCE=200809L", "_GNU_SOURCE"); + else if (qbs.targetOS.contains("macos")) + defines.push("_BSD_SOURCE"); + return defines; + } cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) ? ["dl", "pthread"] : []) @@ -31,10 +40,12 @@ Module { prefix: sqlite_sources.sqliteDir3rdParty + '/' cpp.warningLevel: "none" files: [ + "carray.c", + "config.h", "sqlite3.c", "sqlite3.h", + "sqlite.h", "sqlite3ext.h", - "carray.c" ] } }