Skip to content
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.

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

[folly]: fix build with gcc 13. #31586

Merged
merged 1 commit into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions ports/folly/fix-build-with-gcc-13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001
From: Sam James <[email protected]>
Date: Sun, 22 Jan 2023 05:06:16 +0000
Subject: [PATCH] Fix build with GCC 13 (add missing includes)

GCC 13 (as usual for new compiler releases) shuffles around some
internal includes and so <stdexcept> etc is no longer transitively included.

Signed-off-by: Sam James <[email protected]>
---
folly/system/AtFork.cpp | 3 +++
1 file changed, 3 insertions(+)

diff --git a/folly/system/AtFork.cpp b/folly/system/AtFork.cpp
index e888e52858a..a5570330dc3 100644
--- a/folly/system/AtFork.cpp
+++ b/folly/system/AtFork.cpp
@@ -14,6 +14,9 @@
* limitations under the License.
*/

+#include <stdexcept>
+#include <system_error>
+
#include <folly/system/AtFork.h>

#include <folly/ScopeGuard.h>
1 change: 1 addition & 0 deletions ports/folly/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ vcpkg_from_github(
boost-1.70.patch
fix-windows-minmax.patch
fix-deps.patch
fix-build-with-gcc-13.patch
)

file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
Expand Down
2 changes: 1 addition & 1 deletion ports/folly/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "folly",
"version-string": "2022.10.31.00",
"port-version": 6,
"port-version": 7,
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2558,7 +2558,7 @@
},
"folly": {
"baseline": "2022.10.31.00",
"port-version": 6
"port-version": 7
},
"font-chef": {
"baseline": "1.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/folly.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8",
"version-string": "2022.10.31.00",
"port-version": 7
},
{
"git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db",
"version-string": "2022.10.31.00",
Expand Down