* [Buildroot] [PATCH 1/1] package/boost: drop first patch
@ 2020-06-14 18:46 Fabrice Fontaine
2020-06-14 20:00 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-06-14 18:46 UTC (permalink / raw)
To: buildroot
First patch is not needed since version 1.67.0 and
https://github.com/boostorg/locale/commit/90dd8146fbb01fd0a1b0473ad5a5d28644b65e87
Indeed, since this bump, the patch is wrongly patching
virtual string_type format(double value,size_t &code_points) const
instead of:
virtual string_type format(int64_t value,size_t &code_points) const
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...mbiguous-format-call-on-64bit-builds.patch | 27 -------------------
...fd.patch => 0001-fix-uclibc-eventfd.patch} | 0
.../{0003-fenv.patch => 0002-fenv.patch} | 0
3 files changed, 27 deletions(-)
delete mode 100644 package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
rename package/boost/{0002-fix-uclibc-eventfd.patch => 0001-fix-uclibc-eventfd.patch} (100%)
rename package/boost/{0003-fenv.patch => 0002-fenv.patch} (100%)
diff --git a/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch b/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
deleted file mode 100644
index e8972fd726..0000000000
--- a/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-boost: fix ambiguous format call on 64-bit builds
-
-Fixes problem:
-
-libs/locale/src/icu/formatter.cpp: In member function
-'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format<CharType>::format(boost::int64_t, size_t&) const':
-libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous
-/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const
-/ec/include/unicode/numfmt.h:330: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const
-/ec/include/unicode/numfmt.h:343: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-Backported-from: https://svn.boost.org/trac/boost/ticket/6851
-
-
-diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp
---- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100
-+++ boost_1_49_0/libs/locale/src/icu/formatter.cpp 2012-05-01 14:27:54.000000000 +0100
-@@ -58,7 +58,7 @@
- virtual string_type format(int64_t value,size_t &code_points) const
- {
- icu::UnicodeString tmp;
-- icu_fmt_->format(value,tmp);
-+ icu_fmt_->format(::int64_t(value),tmp);
- code_points=tmp.countChar32();
- return cvt_.std(tmp);
- }
diff --git a/package/boost/0002-fix-uclibc-eventfd.patch b/package/boost/0001-fix-uclibc-eventfd.patch
similarity index 100%
rename from package/boost/0002-fix-uclibc-eventfd.patch
rename to package/boost/0001-fix-uclibc-eventfd.patch
diff --git a/package/boost/0003-fenv.patch b/package/boost/0002-fenv.patch
similarity index 100%
rename from package/boost/0003-fenv.patch
rename to package/boost/0002-fenv.patch
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Buildroot] [PATCH 1/1] package/boost: drop first patch
2020-06-14 18:46 [Buildroot] [PATCH 1/1] package/boost: drop first patch Fabrice Fontaine
@ 2020-06-14 20:00 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-06-14 20:00 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-06-14 20:46 +0200, Fabrice Fontaine spake thusly:
> First patch is not needed since version 1.67.0 and
> https://github.com/boostorg/locale/commit/90dd8146fbb01fd0a1b0473ad5a5d28644b65e87
>
> Indeed, since this bump, the patch is wrongly patching
> virtual string_type format(double value,size_t &code_points) const
>
> instead of:
> virtual string_type format(int64_t value,size_t &code_points) const
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...mbiguous-format-call-on-64bit-builds.patch | 27 -------------------
> ...fd.patch => 0001-fix-uclibc-eventfd.patch} | 0
> .../{0003-fenv.patch => 0002-fenv.patch} | 0
> 3 files changed, 27 deletions(-)
> delete mode 100644 package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
> rename package/boost/{0002-fix-uclibc-eventfd.patch => 0001-fix-uclibc-eventfd.patch} (100%)
> rename package/boost/{0003-fenv.patch => 0002-fenv.patch} (100%)
>
> diff --git a/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch b/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
> deleted file mode 100644
> index e8972fd726..0000000000
> --- a/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -boost: fix ambiguous format call on 64-bit builds
> -
> -Fixes problem:
> -
> -libs/locale/src/icu/formatter.cpp: In member function
> -'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format<CharType>::format(boost::int64_t, size_t&) const':
> -libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous
> -/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const
> -/ec/include/unicode/numfmt.h:330: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const
> -/ec/include/unicode/numfmt.h:343: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const
> -
> -Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> -Backported-from: https://svn.boost.org/trac/boost/ticket/6851
> -
> -
> -diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp
> ---- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100
> -+++ boost_1_49_0/libs/locale/src/icu/formatter.cpp 2012-05-01 14:27:54.000000000 +0100
> -@@ -58,7 +58,7 @@
> - virtual string_type format(int64_t value,size_t &code_points) const
> - {
> - icu::UnicodeString tmp;
> -- icu_fmt_->format(value,tmp);
> -+ icu_fmt_->format(::int64_t(value),tmp);
> - code_points=tmp.countChar32();
> - return cvt_.std(tmp);
> - }
> diff --git a/package/boost/0002-fix-uclibc-eventfd.patch b/package/boost/0001-fix-uclibc-eventfd.patch
> similarity index 100%
> rename from package/boost/0002-fix-uclibc-eventfd.patch
> rename to package/boost/0001-fix-uclibc-eventfd.patch
> diff --git a/package/boost/0003-fenv.patch b/package/boost/0002-fenv.patch
> similarity index 100%
> rename from package/boost/0003-fenv.patch
> rename to package/boost/0002-fenv.patch
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-14 20:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-14 18:46 [Buildroot] [PATCH 1/1] package/boost: drop first patch Fabrice Fontaine
2020-06-14 20:00 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox