From 8b7ac186bfcc5e6ad98f25ac169b8ad3489ee0bc Mon Sep 17 00:00:00 2001 From: Reder Date: Tue, 19 Jul 2022 00:09:27 +0200 Subject: [PATCH] [sqlitecpp] do not use stack protection (#25761) * do not use stack protection fixes #25760 * update version * update baseline * only remove stack protection for mingw64 * update version * Make variable visible even if unused Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * update version Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/sqlitecpp/portfile.cmake | 5 +++++ ports/sqlitecpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlitecpp.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index efeb214506..c60ead0f60 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -14,6 +14,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sqlcipher SQLITE_HAS_CODEC ) +set(USE_STACK_PROTECTION "") +if(VCPKG_TARGET_IS_MINGW) + set(USE_STACK_PROTECTION "-DSQLITECPP_USE_STACK_PROTECTION=OFF") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -25,6 +29,7 @@ vcpkg_configure_cmake( -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF + ${USE_STACK_PROTECTION} ) vcpkg_install_cmake() diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index c86c7b95ed..fef44ac18e 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlitecpp", "version-string": "3.1.1", - "port-version": 1, + "port-version": 2, "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index ee1e860106..cec80f828f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6838,7 +6838,7 @@ }, "sqlitecpp": { "baseline": "3.1.1", - "port-version": 1 + "port-version": 2 }, "sqlpp11": { "baseline": "0.61", diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index 8ad9ced317..7bddf2eded 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b16a053ff6df932be1e7b02ad0b34dff2a03cf5", + "version-string": "3.1.1", + "port-version": 2 + }, { "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", "version-string": "3.1.1",