<div dir="ltr">Breaks with musl:<div><br></div><div><a href="http://errors.yoctoproject.org/Errors/Details/150200/">http://errors.yoctoproject.org/Errors/Details/150200/</a><br></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 7 August 2017 at 12:45, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Drop upstreamed 0001-Fix-FTBFS-problem-with-<wbr>GCC-6.patch<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.<wbr>intel.com</a>><br>
---<br>
meta/recipes-kernel/oprofile/<wbr>oprofile.inc | 1 -<br>
.../0001-Fix-FTBFS-problem-<wbr>with-GCC-6.patch | 51 ----------------------<br>
meta/recipes-kernel/oprofile/<a href="http://oprofile_1.1.0.bb" rel="noreferrer" target="_blank">o<wbr>profile_1.1.0.bb</a> | 10 -----<br>
meta/recipes-kernel/oprofile/<a href="http://oprofile_1.2.0.bb" rel="noreferrer" target="_blank">o<wbr>profile_1.2.0.bb</a> | 10 +++++<br>
4 files changed, 10 insertions(+), 62 deletions(-)<br>
delete mode 100644 meta/recipes-kernel/oprofile/<wbr>oprofile/0001-Fix-FTBFS-<wbr>problem-with-GCC-6.patch<br>
delete mode 100644 meta/recipes-kernel/oprofile/<a href="http://oprofile_1.1.0.bb" rel="noreferrer" target="_blank">o<wbr>profile_1.1.0.bb</a><br>
create mode 100644 meta/recipes-kernel/oprofile/<a href="http://oprofile_1.2.0.bb" rel="noreferrer" target="_blank">o<wbr>profile_1.2.0.bb</a><br>
<br>
diff --git a/meta/recipes-kernel/<wbr>oprofile/oprofile.inc b/meta/recipes-kernel/<wbr>oprofile/oprofile.inc<br>
index 4b01654fa3e..83fc8435cbd 100644<br>
--- a/meta/recipes-kernel/<wbr>oprofile/oprofile.inc<br>
+++ b/meta/recipes-kernel/<wbr>oprofile/oprofile.inc<br>
@@ -25,7 +25,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/<wbr>${BPN}-${PV}.tar.gz \<br>
file://run-ptest \<br>
file://root-home-dir.patch \<br>
file://0001-Add-rmb-<wbr>definition-for-NIOS2-<wbr>architecture.patch \<br>
- file://0001-Fix-FTBFS-problem-<wbr>with-GCC-6.patch \<br>
"<br>
UPSTREAM_CHECK_REGEX = "oprofile-(?P<pver>\d+(\.\d+)+<wbr>)/"<br>
UPSTREAM_CHECK_URI = "<a href="https://sourceforge.net/projects/oprofile/files/oprofile/" rel="noreferrer" target="_blank">https://sourceforge.net/<wbr>projects/oprofile/files/<wbr>oprofile/</a>"<br>
diff --git a/meta/recipes-kernel/<wbr>oprofile/oprofile/0001-Fix-<wbr>FTBFS-problem-with-GCC-6.patch b/meta/recipes-kernel/<wbr>oprofile/oprofile/0001-Fix-<wbr>FTBFS-problem-with-GCC-6.patch<br>
deleted file mode 100644<br>
index d372fd527ba..00000000000<br>
--- a/meta/recipes-kernel/<wbr>oprofile/oprofile/0001-Fix-<wbr>FTBFS-problem-with-GCC-6.patch<br>
+++ /dev/null<br>
@@ -1,51 +0,0 @@<br>
-From 39d4d46a0bd504ac708ffe72df87bf<wbr>74cd12ad30 Mon Sep 17 00:00:00 2001<br>
-From: William Cohen <<a href="mailto:wcohen@redhat.com">wcohen@redhat.com</a>><br>
-Date: Fri, 5 Feb 2016 17:30:19 -0500<br>
-Subject: [PATCH] Fix FTBFS problem with GCC-6<br>
-<br>
-GCC-6 is pickier about some of the type conversions causing the Fedora<br>
-24 mass rebuild the build of oprofile failed with:<br>
-<br>
-make[3]: Entering directory '/builddir/build/BUILD/<wbr>oprofile-1.1.0/libutil++'<br>
-g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/<wbr>redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp<br>
-op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(<wbr>symbol_index_t, long long unsigned int&, long long unsigned int&) const':<br>
-op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream<char>}' to 'const bool' in initialization<br>
- bool const verbose = cverb << (vbfd & vlevel1);<br>
- ^<br>
-op_bfd.cpp:546:7: error: in argument to unary !<br>
- if (!verbose)<br>
- ^~~~~~~<br>
-<br>
-Avoid the intermediate bool type to make GCC-6 happy.<br>
-<br>
-Signed-off-by: William Cohen <<a href="mailto:wcohen@redhat.com">wcohen@redhat.com</a>><br>
----<br>
-Upstream-Status: Backport<br>
-<br>
- libutil++/op_bfd.cpp | 4 +---<br>
- 1 file changed, 1 insertion(+), 3 deletions(-)<br>
-<br>
-diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp<br>
-index 389c920..f2eb42b 100644<br>
---- a/libutil++/op_bfd.cpp<br>
-+++ b/libutil++/op_bfd.cpp<br>
-@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(<wbr>symbol_index_t sym_idx,<br>
- {<br>
- op_bfd_symbol const & sym = syms[sym_idx];<br>
-<br>
-- bool const verbose = cverb << (vbfd & vlevel1);<br>
--<br>
- if (anon_obj)<br>
- start = sym.vma();<br>
- else<br>
- start = sym.filepos();<br>
- end = start + sym.size();<br>
-<br>
-- if (!verbose)<br>
-+ if (!(cverb << (vbfd & vlevel1)))<br>
- return;<br>
-<br>
- io_state state(cverb << (vbfd & vlevel1));<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.1.0.bb" rel="noreferrer" target="_blank">oprofile_1.1.0.bb</a> b/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.1.0.bb" rel="noreferrer" target="_blank">oprofile_1.1.0.bb</a><br>
deleted file mode 100644<br>
index 92a94ad0d4d..00000000000<br>
--- a/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.1.0.bb" rel="noreferrer" target="_blank">oprofile_1.1.0.bb</a><br>
+++ /dev/null<br>
@@ -1,10 +0,0 @@<br>
-require oprofile.inc<br>
-<br>
-DEPENDS += "virtual/kernel"<br>
-DEPENDS_append_powerpc64 = " libpfm4"<br>
-<br>
-SRC_URI[md5sum] = "<wbr>248c4c069f9476f427fa7195563f98<wbr>67"<br>
-SRC_URI[sha256sum] = "<wbr>cf759a6de1a6033d5dfc93bda129a9<wbr>f2e128aecc4238cc657feb0801d1b0<wbr>366c"<br>
-<br>
-S = "${WORKDIR}/oprofile-${PV}"<br>
-<br>
diff --git a/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.2.0.bb" rel="noreferrer" target="_blank">oprofile_1.2.0.bb</a> b/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.2.0.bb" rel="noreferrer" target="_blank">oprofile_1.2.0.bb</a><br>
new file mode 100644<br>
index 00000000000..e85e805c37c<br>
--- /dev/null<br>
+++ b/meta/recipes-kernel/<wbr>oprofile/<a href="http://oprofile_1.2.0.bb" rel="noreferrer" target="_blank">oprofile_1.2.0.bb</a><br>
@@ -0,0 +1,10 @@<br>
+require oprofile.inc<br>
+<br>
+DEPENDS += "virtual/kernel"<br>
+DEPENDS_append_powerpc64 = " libpfm4"<br>
+<br>
+SRC_URI[md5sum] = "<wbr>4fcd3920984dcb607314b2e225086c<wbr>3a"<br>
+SRC_URI[sha256sum] = "<wbr>eb95f98c40b7d0ee29b45fba3565d9<wbr>f8381747528aa6b6159e37d4fa0c8c<wbr>a57d"<br>
+<br>
+S = "${WORKDIR}/oprofile-${PV}"<br>
+<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.13.2<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>