diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/sqlpp11 | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/sqlpp11')
| -rw-r--r-- | ports/sqlpp11/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sqlpp11/FixForMSVC.patch | 24 | ||||
| -rw-r--r-- | ports/sqlpp11/portfile.cmake | 3 |
3 files changed, 2 insertions, 27 deletions
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index b371f0a8c..92e303dec 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11
-Version: 0.58-1 +Version: 0.58-2
Description: A type safe embedded domain specific language for SQL queries and results in C++.
Build-Depends: date
diff --git a/ports/sqlpp11/FixForMSVC.patch b/ports/sqlpp11/FixForMSVC.patch deleted file mode 100644 index 753590707..000000000 --- a/ports/sqlpp11/FixForMSVC.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/include/sqlpp11/char_sequence.h b/include/sqlpp11/char_sequence.h -index 5759525..96cdbd0 100644 ---- a/include/sqlpp11/char_sequence.h -+++ b/include/sqlpp11/char_sequence.h -@@ -54,16 +54,16 @@ namespace sqlpp - } - }; - -- template <std::size_t N, const char (&s)[N], typename T> -+ template <std::size_t N, const char* s, typename T> - struct make_char_sequence_impl; - -- template <std::size_t N, const char (&s)[N], std::size_t... i> -+ template <std::size_t N, const char* s, std::size_t... i> - struct make_char_sequence_impl<N, s, sqlpp::detail::index_sequence<i...>> - { - using type = char_sequence<s[i]...>; - }; - -- template <std::size_t N, const char (&Input)[N]> -+ template <std::size_t N, const char* Input> - using make_char_sequence = - typename make_char_sequence_impl<N, Input, sqlpp::detail::make_index_sequence<N - 1>>::type; - } // namespace sqlpp diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 7fe915213..dbc502382 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -3,10 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11
- REF 0.58 + REF 0.58
SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209
HEAD_REF master
- PATCHES FixForMSVC.patch
)
# Use sqlpp11's own build process, skipping tests
|