diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2020-09-05 13:59:57 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2020-09-05 14:05:18 +0300 |
| commit | 44046f58059e057b3cddd7ce286cd71e6de81955 (patch) | |
| tree | 61bd682b6538ba4b6af079b9cd2232b28ce326bc /dev-util | |
| parent | x11-misc/xfishtank: Depend on media-libs/imlib2[X] (diff) | |
| download | gentoo-44046f58059e057b3cddd7ce286cd71e6de81955.tar.gz gentoo-44046f58059e057b3cddd7ce286cd71e6de81955.tar.bz2 gentoo-44046f58059e057b3cddd7ce286cd71e6de81955.zip | |
dev-util/oprofile: fix build with musl
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/oprofile/files/musl.patch | 23 | ||||
| -rw-r--r-- | dev-util/oprofile/oprofile-1.4.0.ebuild | 3 |
2 files changed, 25 insertions, 1 deletions
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/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 |