Skip to content

Some stuff I seemed to have forgotten to commit #869

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

Merged
merged 3 commits into from
Dec 16, 2021
Merged

Some stuff I seemed to have forgotten to commit #869

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
6f6cca3
Some stuff I seemed to have forgotten to commit
pgoodman Dec 15, 2021
f6f1b5c
Update portfile.cmake
Dec 15, 2021
608dc50
Fix triplet files for upb special case
ekilmer Dec 15, 2021
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
3 changes: 2 additions & 1 deletion ports/grpc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ vcpkg_configure_cmake(
-DgRPC_RE2_PROVIDER=package
-DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
-DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER}
-DgRPC_GFLAGS_PROVIDER=none
-DgRPC_GFLAGS_PROVIDER=package
-DgRPC_BENCHMARK_PROVIDER=none
-DgRPC_BUILD_CSHARP_EXT=OFF
-DgRPC_INSTALL_CSHARP_EXT=OFF
-DgRPC_INSTALL_BINDIR:STRING=bin
-DgRPC_INSTALL_LIBDIR:STRING=lib
Expand Down
1 change: 1 addition & 0 deletions ports/grpc/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"name": "c-ares",
"platform": "!uwp"
},
"gflags",
{
"name": "grpc",
"host": true,
Expand Down
7 changes: 7 additions & 0 deletions ports/upb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@ vcpkg_from_github(
add-all-libs-target.patch
)

if(VCPKG_USE_SANITIZER)
list(APPEND FEATURE_OPTIONS
-DUPB_ENABLE_ASAN=ON
)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/cmake
PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS}
)

vcpkg_install_cmake()
Expand Down
2 changes: 1 addition & 1 deletion triplets/arm64-osx-asan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_USE_SANITIZER "Address")
# If the following flags cause errors during build, you might need to manually
# ignore the PORT and check VCPKG_USE_SANITIZER
if(NOT PORT MATCHES "(llvm-*)")
if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-linux-asan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_USE_SANITIZER "Address")
# If the following flags cause errors during build, you might need to manually
# ignore the PORT and check VCPKG_USE_SANITIZER
if(NOT PORT MATCHES "(llvm-*)")
if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-linux-rel-asan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_USE_SANITIZER "Address")
# If the following flags cause errors during build, you might need to manually
# ignore the PORT and check VCPKG_USE_SANITIZER
if(NOT PORT MATCHES "(llvm-*)")
if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-osx-asan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(VCPKG_USE_SANITIZER "Address")

# If the following flags cause errors during build, you might need to manually
# ignore the PORT and check VCPKG_USE_SANITIZER
if(NOT PORT MATCHES "(llvm-*)")
if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-osx-rel-asan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(VCPKG_USE_SANITIZER "Address")

# If the following flags cause errors during build, you might need to manually
# ignore the PORT and check VCPKG_USE_SANITIZER
if(NOT PORT MATCHES "(llvm-*)")
if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
Expand Down