From 28effe75c465548aac303e92cb438289e48133f5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 15 Aug 2022 20:33:02 +0200 Subject: [PATCH] [c89stringutils] remove forced flags (#26249) * c89stringutils remove flags * v db * remove code * v db --- ports/c89stringutils/no_flags.patch | 20 ++++++++++++++++++++ ports/c89stringutils/portfile.cmake | 2 ++ ports/c89stringutils/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/c89stringutils.json | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/c89stringutils/no_flags.patch diff --git a/ports/c89stringutils/no_flags.patch b/ports/c89stringutils/no_flags.patch new file mode 100644 index 0000000000..b2842c86f5 --- /dev/null +++ b/ports/c89stringutils/no_flags.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ce714554..f9f28b890 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,15 +18,7 @@ target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAK + set(gcc_like "$") + set(msvc "$") + # -g -fsanitize=address -fno-omit-frame-pointer +-target_compile_options( +- "${PROJECT_NAME}_compiler_flags" +- INTERFACE +- "$<${gcc_like}:$>" +- "$<${msvc}:$>" +-) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") +- set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + endif (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + + # configure a header file to pass the version number only diff --git a/ports/c89stringutils/portfile.cmake b/ports/c89stringutils/portfile.cmake index ae15441cb2..06740ebcb2 100644 --- a/ports/c89stringutils/portfile.cmake +++ b/ports/c89stringutils/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 375c87aaf50a945b17a76727f3314eb217897caf SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 HEAD_REF master + PATCHES + no_flags.patch ) vcpkg_cmake_configure( diff --git a/ports/c89stringutils/vcpkg.json b/ports/c89stringutils/vcpkg.json index 7a14d20460..4c2d06670c 100644 --- a/ports/c89stringutils/vcpkg.json +++ b/ports/c89stringutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "c89stringutils", "version": "0.0.1", + "port-version": 1, "description": "string functions from newer standards / common non-standards for C89", "license": "Apache-2.0 OR MIT", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index ac960f2965..55a69c202f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1234,7 +1234,7 @@ }, "c89stringutils": { "baseline": "0.0.1", - "port-version": 0 + "port-version": 1 }, "c9y": { "baseline": "0.4.0", diff --git a/versions/c-/c89stringutils.json b/versions/c-/c89stringutils.json index 7d7aa3a414..826d84dec6 100644 --- a/versions/c-/c89stringutils.json +++ b/versions/c-/c89stringutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c282e10d69a020f581a2bd7b8d8ead1e29d9a2", + "version": "0.0.1", + "port-version": 1 + }, { "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", "version": "0.0.1",