diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-09-06 23:11:50 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-09-06 23:12:16 -0400 |
| commit | 3ae39c3d04203862680a9b776393aec91a46285c (patch) | |
| tree | 1c8579a8b057f6f33604d096895139f8f1e69751 /media-video | |
| parent | Fix #493306, where libiconv.so was merged into FreeBSd's libc in 10.x. Witho... (diff) | |
| download | gentoo-3ae39c3d04203862680a9b776393aec91a46285c.tar.gz gentoo-3ae39c3d04203862680a9b776393aec91a46285c.tar.bz2 gentoo-3ae39c3d04203862680a9b776393aec91a46285c.zip | |
media-video/cclive: fix building w/gcc-5 #548310
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cclive/cclive-0.9.3-r1.ebuild | 1 | ||||
| -rw-r--r-- | media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/media-video/cclive/cclive-0.9.3-r1.ebuild b/media-video/cclive/cclive-0.9.3-r1.ebuild index e911be3df68f..8566a4e9e4d7 100644 --- a/media-video/cclive/cclive-0.9.3-r1.ebuild +++ b/media-video/cclive/cclive-0.9.3-r1.ebuild @@ -26,6 +26,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-iostream.patch #527658 + epatch "${FILESDIR}"/${P}-boost-ver-check.patch #548310 } src_configure() { diff --git a/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch new file mode 100644 index 000000000000..23e69dd1b665 --- /dev/null +++ b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/548310 + +apply boost.m4 updates to fix building w/gcc-5 + +--- a/configure ++++ b/configure +@@ -17481,8 +17481,10 @@ + boost-lib-version = BOOST_LIB_VERSION + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ grep -v '#' | + tr -d '\r' | +- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then : ++ tr -s '\n' ' ' | ++ $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then : + boost_cv_lib_version=`cat conftest.i` + fi + rm -rf conftest* |