* [meta-oe][gatesgarth][PATCH 1/2] rapidjson: Upgrade SRCREV to latest @ 2021-03-15 6:49 Harpritkaur Bhandari 2021-03-15 6:49 ` [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches Harpritkaur Bhandari 0 siblings, 1 reply; 5+ messages in thread From: Harpritkaur Bhandari @ 2021-03-15 6:49 UTC (permalink / raw) To: openembedded-devel, raj.khem Cc: nisha.parrakat, Harpritkaur Bhandari, Armin Kuster From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com> Upgrade SRCREV to latest as it fixes the below issue: Running UndefinedBehaviorSanitizer on projects that use rapidjson triggers 'applying non-zero offset <NN> to null pointer' findings in 'internal/stack.h' which are hard to suppress by library users. Removed "0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" as the changes are already incorporated in the latest codebase. As per abi-compliance-checker report the source compatibility and binary compatibility between previous SRCREV 6a905f9311f82d306da77bd963ec5aa5da07da9c and current SRCREV 0ccdbf364c577803e2a751f5aededce935314313 is 100% and this patch is already tested on 64bit ARM (aarch64) in a product with on target CI tests. Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 04d9ea0ba7ece968244bf049893dd5636675b76f) Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> --- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index e3ed9c6..5b5c8b2 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ - file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1" -SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c" +SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" PV = "1.1.0+git${SRCPV}" -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches 2021-03-15 6:49 [meta-oe][gatesgarth][PATCH 1/2] rapidjson: Upgrade SRCREV to latest Harpritkaur Bhandari @ 2021-03-15 6:49 ` Harpritkaur Bhandari 2021-03-22 7:07 ` Harpritkaur Bhandari 0 siblings, 1 reply; 5+ messages in thread From: Harpritkaur Bhandari @ 2021-03-15 6:49 UTC (permalink / raw) To: openembedded-devel, raj.khem; +Cc: nisha.parrakat, Harpritkaur Bhandari From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com> 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: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 5aa127af2d3942c9b1dfcd768a8123513a26c53f) Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> --- ...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 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 745f5d0..0000000 --- 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 <rbilovol@cisco.com> -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 <rbilovol@cisco.com> ---- - 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 cf3e16e..0000000 --- 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 <armccurdy@gmail.com> -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 <armccurdy@gmail.com> ---- - 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) -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches 2021-03-15 6:49 ` [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches Harpritkaur Bhandari @ 2021-03-22 7:07 ` Harpritkaur Bhandari 2021-03-30 12:06 ` Harpritkaur Bhandari 0 siblings, 1 reply; 5+ messages in thread From: Harpritkaur Bhandari @ 2021-03-22 7:07 UTC (permalink / raw) To: openembedded-devel, raj.khem; +Cc: Nisha Parrakat [-- Attachment #1: Type: text/plain, Size: 6367 bytes --] Hi, Can you please confirm when this patch will get merged in gatesgarth branch. Thanks, Harprit Bhandari ________________________________ From: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Sent: 15 March 2021 12:19 To: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org>; raj.khem@gmail.com <raj.khem@gmail.com> Cc: Nisha Parrakat <Nisha.Parrakat@kpit.com>; Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Subject: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com> 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: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 5aa127af2d3942c9b1dfcd768a8123513a26c53f) Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> --- ...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 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 745f5d0..0000000 --- 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 <rbilovol@cisco.com> -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 <rbilovol@cisco.com> ---- - 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 cf3e16e..0000000 --- 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 <armccurdy@gmail.com> -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 <armccurdy@gmail.com> ---- - 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) -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. [-- Attachment #2: Type: text/html, Size: 10766 bytes --] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches 2021-03-22 7:07 ` Harpritkaur Bhandari @ 2021-03-30 12:06 ` Harpritkaur Bhandari 2021-03-30 14:38 ` [oe] " akuster 0 siblings, 1 reply; 5+ messages in thread From: Harpritkaur Bhandari @ 2021-03-30 12:06 UTC (permalink / raw) To: openembedded-devel, raj.khem; +Cc: Nisha Parrakat [-- Attachment #1: Type: text/plain, Size: 6866 bytes --] Hi, Can you please confirm when this patch will get merged in gatesgarth branch? Thanks, Harprit Bhandari ________________________________ From: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Sent: 22 March 2021 12:37 To: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org>; raj.khem@gmail.com <raj.khem@gmail.com> Cc: Nisha Parrakat <Nisha.Parrakat@kpit.com> Subject: Re: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches Hi, Can you please confirm when this patch will get merged in gatesgarth branch. Thanks, Harprit Bhandari ________________________________ From: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Sent: 15 March 2021 12:19 To: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org>; raj.khem@gmail.com <raj.khem@gmail.com> Cc: Nisha Parrakat <Nisha.Parrakat@kpit.com>; Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> Subject: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com> 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: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 5aa127af2d3942c9b1dfcd768a8123513a26c53f) Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> --- ...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 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 745f5d0..0000000 --- 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 <rbilovol@cisco.com> -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 <rbilovol@cisco.com> ---- - 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 cf3e16e..0000000 --- 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 <armccurdy@gmail.com> -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 <armccurdy@gmail.com> ---- - 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) -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. [-- Attachment #2: Type: text/html, Size: 12641 bytes --] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [oe] [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches 2021-03-30 12:06 ` Harpritkaur Bhandari @ 2021-03-30 14:38 ` akuster 0 siblings, 0 replies; 5+ messages in thread From: akuster @ 2021-03-30 14:38 UTC (permalink / raw) To: Harpritkaur Bhandari, openembedded-devel, raj.khem; +Cc: Nisha Parrakat On 3/30/21 5:06 AM, Harpritkaur Bhandari wrote: > Hi, > > Can you please confirm when this patch will get merged > in gatesgarth branch? I can not at this time. Its in my testing branch. I lost my one build system last week and I use it to build both Gateharth and Dunfell. Things are backup for both. I hope to have thing sorted out by weeks end. -armin > > Thanks, > Harprit Bhandari > > ------------------------------------------------------------------------ > *From:* Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> > *Sent:* 22 March 2021 12:37 > *To:* openembedded-devel@lists.openembedded.org > <openembedded-devel@lists.openembedded.org>; raj.khem@gmail.com > <raj.khem@gmail.com> > *Cc:* Nisha Parrakat <Nisha.Parrakat@kpit.com> > *Subject:* Re: [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove > unwanted patches > > Hi, > > Can you please confirm when this patch will get merged in gatesgarth > branch. > > Thanks, > Harprit Bhandari > > ------------------------------------------------------------------------ > *From:* Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> > *Sent:* 15 March 2021 12:19 > *To:* openembedded-devel@lists.openembedded.org > <openembedded-devel@lists.openembedded.org>; raj.khem@gmail.com > <raj.khem@gmail.com> > *Cc:* Nisha Parrakat <Nisha.Parrakat@kpit.com>; Harpritkaur Bhandari > <Harpritkaur.Bhandari@kpit.com> > *Subject:* [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted > patches > > From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com> > > 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: Khem Raj <raj.khem@gmail.com> > (cherry picked from commit 5aa127af2d3942c9b1dfcd768a8123513a26c53f) > Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com> > --- > ...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 > > 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 745f5d0..0000000 > --- > 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 <rbilovol@cisco.com> > -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 <rbilovol@cisco.com> > ---- > - 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 cf3e16e..0000000 > --- > 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 <armccurdy@gmail.com> > -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 <armccurdy@gmail.com> > ---- > - 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) > -- > 2.7.4 > > This message contains information that may be privileged or > confidential and is the property of the KPIT Technologies Ltd. It is > intended only for the person to whom it is addressed. If you are not > the intended recipient, you are not authorized to read, print, retain > copy, disseminate, distribute, or use this message or any part > thereof. If you receive this message in error, please notify the > sender immediately and delete all copies of this message. KPIT > Technologies Ltd. does not accept any liability for virus infected mails. > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-30 14:38 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-03-15 6:49 [meta-oe][gatesgarth][PATCH 1/2] rapidjson: Upgrade SRCREV to latest Harpritkaur Bhandari 2021-03-15 6:49 ` [meta-oe][gatesgarth][PATCH 2/2] rapidjson: Remove unwanted patches Harpritkaur Bhandari 2021-03-22 7:07 ` Harpritkaur Bhandari 2021-03-30 12:06 ` Harpritkaur Bhandari 2021-03-30 14:38 ` [oe] " akuster
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.