summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarpritkaur Bhandari <harpritkaur.bhandari@kpit.com>2021-02-03 16:20:05 +0530
committerKhem Raj <raj.khem@gmail.com>2021-02-04 08:53:47 -0800
commit5aa127af2d3942c9b1dfcd768a8123513a26c53f (patch)
tree48934550e77caad46a0e4be1cae1d92c05c2a1e0
parent8ef97dd1c48042e66289ddb87227af11bfd55169 (diff)
downloadmeta-openembedded-5aa127af2d3942c9b1dfcd768a8123513a26c53f.tar.gz
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 <Harpritkaur.Bhandari@kpit.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch36
-rw-r--r--meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch40
2 files changed, 0 insertions, 76 deletions
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 @@
1From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001
2From: Ruslan Bilovol <rbilovol@cisco.com>
3Date: Thu, 24 Jan 2019 18:11:39 +0200
4Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path
5
6Currently this path is hardcoded to lib/cmake.
7Some distributions have different library path (like lib64).
8So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR
9configurable and usable in such distros.
10
11Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9]
12
13Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
14---
15 CMakeLists.txt | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 7c60407..0275672 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
23 ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY)
24
25 # ... for the install tree
26-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} )
27+SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} )
28 FILE( RELATIVE_PATH REL_INCLUDE_DIR
29- "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
30+ "${CMAKECONFIG_INSTALL_DIR}"
31 "${CMAKE_INSTALL_PREFIX}/include" )
32
33 SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" )
34--
351.9.1
36
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 @@
1From 827155e5e659b2a5065b00d701bc59b57feab2bf Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Mon, 19 Dec 2016 01:37:11 -0800
4Subject: [PATCH] remove -march=native from CMAKE_CXX_FLAGS
5
6Not appropriate when cross compiling.
7
8Upstream-Status: Inappropriate [configuration]
9
10Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
11---
12 CMakeLists.txt | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15Index: git/CMakeLists.txt
16===================================================================
17--- git.orig/CMakeLists.txt
18+++ git/CMakeLists.txt
19@@ -51,10 +51,10 @@ endif(CCACHE_FOUND)
20
21 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
22 if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
23- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
24+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
25 else()
26 #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.
27- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
28+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
29 endif()
30 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
31 set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
32@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C
33 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
34 else()
35 #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.
36- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
37+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
38 endif()
39 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
40 set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything)