Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 575596 Details for
Bug 684830
dev-util/apitrace-8.0 should not link with non-native app-arch/brotli
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
apitrace-8.0.ebuild-v2.patch
apitrace-8.0.ebuild-v2.patch (text/plain), 2.24 KB, created by
Alexander Tsoy
on 2019-05-09 11:55:41 UTC
(
hide
)
Description:
apitrace-8.0.ebuild-v2.patch
Filename:
MIME Type:
Creator:
Alexander Tsoy
Created:
2019-05-09 11:55:41 UTC
Size:
2.24 KB
patch
obsolete
>--- a/gentoo/dev-util/apitrace/apitrace-8.0.ebuild 2019-05-08 20:09:47.000000000 +0300 >+++ b/gentoo/dev-util/apitrace/apitrace-8.0.ebuild 2019-05-09 14:16:23.615646226 +0300 >@@ -18,12 +18,20 @@ > REQUIRED_USE="${PYTHON_REQUIRED_USE}" > > DEPEND="${PYTHON_DEPS} >- app-arch/brotli:= > media-libs/libpng:0= > media-libs/mesa[egl?,${MULTILIB_USEDEP}] >- sys-libs/zlib[${MULTILIB_USEDEP}] > sys-process/procps:= > x11-libs/libX11 >+ cli? ( >+ app-arch/brotli:=[${MULTILIB_USEDEP}] >+ sys-libs/zlib[${MULTILIB_USEDEP}] >+ system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] ) >+ ) >+ !cli? ( >+ app-arch/brotli:= >+ sys-libs/zlib >+ system-snappy? ( >=app-arch/snappy-1.1.1 ) >+ ) > egl? ( > >=media-libs/mesa-8.0[gles1,gles2] > media-libs/waffle[egl] >@@ -34,7 +42,6 @@ > dev-qt/qtnetwork:5 > dev-qt/qtwidgets:5[-gles2] > ) >- system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] ) > " > RDEPEND="${DEPEND}" > >@@ -64,37 +71,44 @@ > my_configure() { > local mycmakeargs=( > -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} >+ -DENABLE_CLI=$(usex cli) > -DENABLE_EGL=$(usex egl) > -DENABLE_STATIC_SNAPPY=$(usex !system-snappy) > ) > if multilib_is_native_abi ; then > mycmakeargs+=( >- -DENABLE_CLI=$(usex cli) > -DENABLE_GUI=$(usex qt5) > ) > else > mycmakeargs+=( > -DBUILD_LIB_ONLY=ON >- -DENABLE_CLI=OFF > -DENABLE_GUI=OFF > ) > fi > cmake-utils_src_configure > } > >- multilib_parallel_foreach_abi my_configure >+ multilib_foreach_abi my_configure > } > > src_install() { >+ local MULTILIB_CHOST_TOOLS=() >+ if use cli; then >+ MULTILIB_CHOST_TOOLS=( >+ /usr/bin/apitrace$(get_exeext) >+ ) >+ fi >+ > cmake-multilib_src_install > >- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so >- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 >- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 >+ make_libgl_symlinks() { >+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so >+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 >+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 >+ } >+ >+ multilib_foreach_abi make_libgl_symlinks > > rm docs/INSTALL.markdown || die > dodoc docs/* README.markdown >- >- exeinto /usr/$(get_libdir)/${PN}/scripts >- doexe $(find scripts -type f -executable) > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 684830
:
574876
|
574878
|
575592
|
575594
| 575596