Archives
Archives
| From: | Mike Gilbert <floppym@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] repo/gentoo:master commit in: eclass/ |
| Date: | Sun, 10 May 2020 20:11:05 |
| Message-Id: | 1589141359.5cd28f85e7cef552d4e7f4f2a23e12383cec786c.floppym@gentoo |
| 1 | commit: 5cd28f85e7cef552d4e7f4f2a23e12383cec786c |
| 2 | Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 | AuthorDate: Sun May 10 20:09:19 2020 +0000 |
| 4 | Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 | CommitDate: Sun May 10 20:09:19 2020 +0000 |
| 6 | URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd28f85 |
| 7 | |
| 8 | meson.eclass: add workaround for broken boost detection |
| 9 | |
| 10 | Bug: https://bugs.gentoo.org/721786 |
| 11 | Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 | |
| 13 | eclass/meson.eclass | 4 ++++ |
| 14 | 1 file changed, 4 insertions(+) |
| 15 | |
| 16 | diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 17 | index 340dbfd1ff9..e79faa1beea 100644 |
| 18 | --- a/eclass/meson.eclass |
| 19 | +++ b/eclass/meson.eclass |
| 20 | @@ -366,6 +366,10 @@ meson_src_configure() { |
| 21 | # https://bugs.gentoo.org/625396 |
| 22 | python_export_utf8_locale |
| 23 | |
| 24 | + # https://bugs.gentoo.org/721786 |
| 25 | + local -x BOOST_INCLUDEDIR="${BOOST_INCLUDEDIR-${EPREFIX}/usr/include}" |
| 26 | + local -x BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}" |
| 27 | + |
| 28 | ( |
| 29 | # https://bugs.gentoo.org/720860 |
| 30 | if ver_test "$(meson --version)" -lt "0.54"; then |