From e191da81b27750685d841abad0b0b5b427459dba Mon Sep 17 00:00:00 2001 From: Harpritkaur Bhandari Date: Wed, 3 Feb 2021 16:20:05 +0530 Subject: rapidjson: Remove unwanted patches rapidjson is upgraded to latest SRCREV so removing the below patches which are not applicable: 1.0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch 2.remove-march-native-from-CMAKE_CXX_FLAGS.patch Signed-off-by: Harpritkaur Bhandari Signed-off-by: Khem Raj (cherry picked from commit 5aa127af2d3942c9b1dfcd768a8123513a26c53f) Signed-off-by: Harpritkaur Bhandari Signed-off-by: Armin Kuster --- ...ve-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch | 36 ------------------- .../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 40 ---------------------- 2 files changed, 76 deletions(-) delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch deleted file mode 100644 index 745f5d0132..0000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001 -From: Ruslan Bilovol -Date: Thu, 24 Jan 2019 18:11:39 +0200 -Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path - -Currently this path is hardcoded to lib/cmake. -Some distributions have different library path (like lib64). -So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR -configurable and usable in such distros. - -Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9] - -Signed-off-by: Ruslan Bilovol ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c60407..0275672 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY) - - # ... for the install tree --SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} ) -+SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) - FILE( RELATIVE_PATH REL_INCLUDE_DIR -- "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" -+ "${CMAKECONFIG_INSTALL_DIR}" - "${CMAKE_INSTALL_PREFIX}/include" ) - - SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch deleted file mode 100644 index cf3e16ea5d..0000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 827155e5e659b2a5065b00d701bc59b57feab2bf Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 19 Dec 2016 01:37:11 -0800 -Subject: [PATCH] remove -march=native from CMAKE_CXX_FLAGS - -Not appropriate when cross compiling. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/CMakeLists.txt -=================================================================== ---- git.orig/CMakeLists.txt -+++ git/CMakeLists.txt -@@ -51,10 +51,10 @@ endif(CCACHE_FOUND) - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) -@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything) -- cgit 1.2.3-korg