summaryrefslogtreecommitdiff
path: root/dev-util/oprofile
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
commit9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
treeb690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-util/oprofile
parentb17a3ef12038de50228bade1f05502c74e135321 (diff)
gentoo resync : 16.09.2020
Diffstat (limited to 'dev-util/oprofile')
-rw-r--r--dev-util/oprofile/Manifest5
-rw-r--r--dev-util/oprofile/files/musl.patch23
-rw-r--r--dev-util/oprofile/metadata.xml1
-rw-r--r--dev-util/oprofile/oprofile-1.4.0.ebuild3
4 files changed, 28 insertions, 4 deletions
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 0a6b13b59d65..87e27db7648f 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,6 +1,7 @@
AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
+AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca7773b53b0efd1557f3e2366110685d673e2140e15855bee4220c6306a06d9ff1358bf6cbfd2 SHA512 fb9515de16bfa621fbb2f83a446b976ea8c123f779c2955a8740234310fdca66e1ea005d1c5a643b785ecf3797f658eec1a96b673b3cb534a55f30b182444a72
DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
-EBUILD oprofile-1.4.0.ebuild 1966 BLAKE2B 2c9809cfd086ab38c5a35dfbcc2b132b28e779f421e145df3d8d864fed781fa3abc02915ec30c62ab672ba7f130f80b557bb846f352a54fcb7ef73622af41ccd SHA512 b241793336ec5f6761ed8c5893410cdc66c0fa78c971e5188646a911aa5298b7b9a2ba8be59c9103f34819051046526921a5f378dc2b48afd0ee1de074e2fa19
-MISC metadata.xml 508 BLAKE2B 6568a105deae028206c3dc0e7fa1a4fbe76eef58a4af5ebec47ce8af093803dc5b74f120a25db38bbd7dbd7b17b44a301ca4af27a5da99fbc91e90e7b1fffd9a SHA512 fe94dcd0876d1f7bc500bb02a0fb1bd998c24f84ebb483f28629ea87dfe507f8fb74d2b8847e9d1a938f45f8cc6b0776f431184cfbd38273d32b5f35c97b00e4
+EBUILD oprofile-1.4.0.ebuild 2016 BLAKE2B a56ddd9a7058c6b897f77cc8c79c719de5a524f2094250dcfcf421ffaf81334fb8ab578c86475910a1ec7e432c225244361f5b88f42d77ed9d153d20ec96f0b3 SHA512 b92c6f600a90796cb8e69e243d97f89ffdc256b2348e4bac6de959af6b7ddc28c011debe860984e92ec552bde930caecb7396936878cb5fb03dde0e686aa9b96
+MISC metadata.xml 423 BLAKE2B 18e22d9fcde7236f7aacf9513bb12e7ae4a7eb07445b1b2c56b563a816b02d600722865d8460e810ae0206632b7b52703cac1812aea9626dcd47fd173d4b8cc5 SHA512 2bc1c9012a9f410cc206abf7b5471c1f8b3adf214241ab3ce1da36f34597a2ccc309ee627582c766d1988440a21e8df7a90668691fd57015b6cdd4db34661f22
diff --git a/dev-util/oprofile/files/musl.patch b/dev-util/oprofile/files/musl.patch
new file mode 100644
index 000000000000..985eeece7bd8
--- /dev/null
+++ b/dev-util/oprofile/files/musl.patch
@@ -0,0 +1,23 @@
+--- oprofile-1.4.0/pe_profiling/operf.cpp.orig 2016-08-08 18:03:27.000000000 +0300
++++ oprofile-1.4.0/pe_profiling/operf.cpp 2020-09-05 12:45:55.237558495 +0300
+@@ -860,9 +860,9 @@
+ {
+ if (remove(fpath)) {
+ perror("sample data removal error");
+- return FTW_STOP;
++ return 1;
+ } else {
+- return FTW_CONTINUE;
++ return 0;
+ }
+ }
+
+@@ -897,7 +897,7 @@
+ return;
+
+ if (!operf_options::append) {
+- int flags = FTW_DEPTH | FTW_ACTIONRETVAL;
++ int flags = FTW_DEPTH;
+ errno = 0;
+ if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 &&
+ errno != ENOENT) {
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index 99119adc69ca..37347fcafed4 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/metadata.xml
@@ -5,7 +5,6 @@
<email>bircoph@gentoo.org</email>
<name>Andrew Savchenko</name>
</maintainer>
- <longdescription>A transparent low-overhead system-wide profiler</longdescription>
<use>
<flag name="apidoc">Provide doxygen generated API docs.</flag>
</use>
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index e881632d5f3b..485fdf66c1f0 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
CDEPEND="
>=dev-libs/popt-1.7-r1
sys-libs/binutils-libs:=
- >=sys-libs/glibc-2.3.2-r1
+ elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 )
ppc64? ( dev-libs/libpfm )
"
DEPEND="${CDEPEND}
@@ -46,6 +46,7 @@ pkg_setup() {
}
src_prepare() {
+ eapply "${FILESDIR}/musl.patch"
# bug 723092
sed -i 's/==/=/g' configure.ac || die