Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
Date: Wed, 22 Jun 2022 18:35:17
Message-Id: 1655922904.e8114ae86f9257cfcb4fd37a0ea228e6bdf6bae9.andrewammerlaan@gentoo
1 commit: e8114ae86f9257cfcb4fd37a0ea228e6bdf6bae9
2 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 22 13:49:13 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 18:35:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8114ae8
7
8 dev-util/roctracer: patch to respect LDFLAG
9
10 Closes: https://bugs.gentoo.org/766851
11 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/25891
13 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
14
15 dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch | 13 +++++++++++++
16 dev-util/roctracer/roctracer-4.3.0-r2.ebuild | 1 +
17 dev-util/roctracer/roctracer-5.0.2.ebuild | 1 +
18 3 files changed, 15 insertions(+)
19
20 diff --git a/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
21 new file mode 100644
22 index 000000000000..a1db6922158a
23 --- /dev/null
24 +++ b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
25 @@ -0,0 +1,13 @@
26 +Index: roctracer-rocm-4.3.0/cmake_modules/env.cmake
27 +===================================================================
28 +--- roctracer-rocm-4.3.0.orig/cmake_modules/env.cmake
29 ++++ roctracer-rocm-4.3.0/cmake_modules/env.cmake
30 +@@ -51,7 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
31 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants" )
32 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
33 +
34 +-set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack" )
35 ++set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bdynamic -Wl,-z,noexecstack" )
36 +
37 + set ( CMAKE_SKIP_BUILD_RPATH TRUE )
38 +
39
40 diff --git a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
41 index 88fb2b6669fb..e5c7872fe3a1 100644
42 --- a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
43 +++ b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
44 @@ -31,6 +31,7 @@ BDEPEND="
45 PATCHES=(
46 # https://github.com/ROCm-Developer-Tools/roctracer/pull/63
47 "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
48 + "${FILESDIR}"/${PN}-4.3.0-ldflag.patch
49 "${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
50 )
51
52
53 diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
54 index 755100264624..efabd899d252 100644
55 --- a/dev-util/roctracer/roctracer-5.0.2.ebuild
56 +++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
57 @@ -31,6 +31,7 @@ BDEPEND="
58 PATCHES=(
59 # https://github.com/ROCm-Developer-Tools/roctracer/pull/63
60 "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
61 + "${FILESDIR}"/${PN}-4.3.0-ldflag.patch
62 "${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
63 "${FILESDIR}"/${PN}-5.0.2-Werror.patch
64 "${FILESDIR}"/${PN}-5.0.2-headers.patch