commit: 548d7270d6a895bcd7ce4af5bb6417e8508d2175 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Tue Jun 14 08:02:26 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Jun 22 18:35:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548d7270
dev-util/rocprofiler: QA fixes Closes: https://bugs.gentoo.org/851792 Closes: https://bugs.gentoo.org/851795 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch | 13 +++++++++++++ dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch | 13 +++++++++++++ dev-util/rocprofiler/rocprofiler-4.3.0.ebuild | 2 ++ dev-util/rocprofiler/rocprofiler-5.0.2.ebuild | 4 +++- 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch new file mode 100644 index 000000000000..dc097a568ca4 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch @@ -0,0 +1,13 @@ +Index: rocprofiler-rocm-5.0.2/cmake_modules/env.cmake +=================================================================== +--- rocprofiler-rocm-5.0.2.orig/cmake_modules/env.cmake ++++ rocprofiler-rocm-5.0.2/cmake_modules/env.cmake +@@ -51,7 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS + #set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=int-in-bool-context" ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" ) + +-set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack" ) ++set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bdynamic -Wl,-z,noexecstack" ) + + set ( CMAKE_SKIP_BUILD_RPATH TRUE ) + diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch new file mode 100644 index 000000000000..3da3d99357f7 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch @@ -0,0 +1,13 @@ +Index: rocprofiler-rocm-5.0.2/cmake_modules/env.cmake +=================================================================== +--- rocprofiler-rocm-5.0.2.orig/cmake_modules/env.cmake ++++ rocprofiler-rocm-5.0.2/cmake_modules/env.cmake +@@ -92,8 +92,6 @@ string ( TOLOWER "${CMAKE_BUILD_TYPE}" C + if ( "${CMAKE_BUILD_TYPE}" STREQUAL debug ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb" ) + set ( CMAKE_BUILD_TYPE "debug" ) +-else () +- set ( CMAKE_BUILD_TYPE "release" ) + endif () + + ## Extend Compiler flags based on Processor architecture diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild index 28e57bde66a4..630f4754fc8f 100644 --- a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild +++ b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild @@ -27,6 +27,8 @@ BDEPEND=" " PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch" + "${FILESDIR}/${PN}-4.3.0-nostrip.patch" + "${FILESDIR}/${PN}-4.3.0-ldflag.patch" "${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" ) python_check_deps() { diff --git a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild index ff321726622e..7e8f0346636d 100644 --- a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild +++ b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild @@ -26,7 +26,9 @@ BDEPEND=" ') " -PATCHES=( "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch" + "${FILESDIR}/${PN}-4.3.0-ldflag.patch" + "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" ) python_check_deps() { has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
