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.

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

Jump to bottom

Rebuild for fmt 11 #215

Closed
wants to merge 3 commits into from
Closed

Rebuild for fmt 11 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3713dea
Rebuild for fmt 11
regro-cf-autotick-bot Aug 12, 2024
4e8dc53
MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and co…
regro-cf-autotick-bot Aug 12, 2024
8692758
patch: fix: Do not use generator expression for "/utf-8" on Windows
jjerphan Aug 12, 2024
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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_folly_build_extNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_folly_build_extjemalloc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- jemalloc
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_folly_build_extNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_folly_build_extjemalloc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- jemalloc
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_folly_build_extNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_folly_build_extjemalloc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fmt:
- '10'
- '11'
folly_build_ext:
- jemalloc
gflags:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/fmt11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for fmt 11
kind: version
migration_number: 1
fmt:
- '11'
migrator_ts: 1720374637.828791
8 changes: 0 additions & 8 deletions .ci_support/migrations/glog07.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_folly_build_extNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_folly_build_extjemalloc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
fmt:
- '10'
- '11'
folly_build_ext:
- jemalloc
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_folly_build_extNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_folly_build_extjemalloc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
fmt:
- '10'
- '11'
folly_build_ext:
- jemalloc
gflags:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
fmt:
- '10'
- '11'
folly_build_ext:
- None
gflags:
Expand Down
36 changes: 36 additions & 0 deletions recipe/0001-fix-Do-not-use-generator-expression-for-utf-8-on-Win.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From c700a30ae6367cb4a934385d7e9bf062bd140ed9 Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Mon, 12 Aug 2024 14:52:38 +0200
Subject: [PATCH] fix: Do not use generator expression for "/utf-8" on Windows

See: https://github.com/facebook/folly/issues/2250

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
---
CMake/GenPkgConfig.cmake | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake
index 0e93175bd..c854acb02 100644
--- a/CMake/GenPkgConfig.cmake
+++ b/CMake/GenPkgConfig.cmake
@@ -105,6 +105,16 @@ function(gen_pkgconfig_vars)
)
endif()

+ # On Windows replace "$<$<COMPILE_LANGUAGE:CXX>:/utf-8>" with "/utf-8"
+ # See: https://github.com/facebook/folly/issues/1433
+ if(WIN32)
+ string(REPLACE
+ "$<$<COMPILE_LANGUAGE:CXX>:/utf-8>" ""
+ cflags "${cflags}"
+ )
+ set(cflags "${cflags} /utf-8")
+ endif()
+
set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)
set("${var_prefix}_PRIVATE_LIBS" "${private_libs}" PARENT_SCOPE)
endfunction()
--
2.45.2

2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:
- 0001-Add-missing-unistd-include.patch

build:
number: 0
number: 1
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ build_ext }}
ignore_run_exports:
- jemalloc # [(not osx) and (folly_build_ext is not undefined and folly_build_ext == "jemalloc")]
Expand Down
Loading