diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-03 02:35:26 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-03 02:35:26 +0000 |
| commit | 0d36e830bd13858d42f5bfa36acb8471d87eca8d (patch) | |
| tree | e039a5033cc3676652e64453a2183f653a9b679f | |
| parent | 2021-06-03 02:20:29 UTC (diff) | |
| parent | profiles/arch/sparc: mask dev-cpp/eigen[test] (diff) | |
| download | gentoo-0d36e830bd13858d42f5bfa36acb8471d87eca8d.tar.gz gentoo-0d36e830bd13858d42f5bfa36acb8471d87eca8d.tar.bz2 gentoo-0d36e830bd13858d42f5bfa36acb8471d87eca8d.zip | |
Merge updates from master
| -rw-r--r-- | app-i18n/librime/librime-1.7.3.ebuild | 4 | ||||
| -rw-r--r-- | profiles/arch/sparc/package.use.mask | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3.ebuild index 44310ba275b7..c42f5d509f4e 100644 --- a/app-i18n/librime/librime-1.7.3.ebuild +++ b/app-i18n/librime/librime-1.7.3.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" BDEPEND="dev-libs/capnproto:0" RDEPEND="app-i18n/opencc:0= - >=dev-cpp/glog-0.3.5:0= + !sparc? ( >=dev-cpp/glog-0.3.5:0= ) dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/capnproto:0= @@ -66,6 +66,8 @@ src_configure() { -DBUILD_TEST=$(usex test ON OFF) -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON -DENABLE_EXTERNAL_PLUGINS=ON + # dev-cpp/glog is currently marked -sparc + -DENABLE_LOGGING=$(usex !sparc) -DINSTALL_PRIVATE_HEADERS=ON ) diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index fd0250b3a871..5f0e692d0cef 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,12 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <sam@gentoo.org> (2021-06-03) +# Mask tests on dev-cpp/eigen for now as they're rather large and +# eigen itself is only being dragged in as a test dependency for now. +# bug #760803 +dev-cpp/eigen test + # Marek Szuba <marecki@gentoo.org> (2021-05-07) # Legacy interface that depends on kernel headers not available on this arch # as well as currently-unkeyworded dev-libs/libx86 |