Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64-fbsd/, sci-libs/lapack/, profiles/features/prefix/rpath/, ...
Date: Wed, 26 Jun 2019 06:07:24
Message-Id: 1561529169.251f5c99d0ef0a397afc1d01999106577450e534.heroxbd@gentoo
1 commit: 251f5c99d0ef0a397afc1d01999106577450e534
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 26 05:07:52 2019 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 26 06:06:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251f5c99
7
8 sci-libs/lapack: add eselect-ldso USE flag.
9
10 profiles: mask eselect-ldso USE flags on fbsd and rpath ARCH.
11
12 eselect-ldso USE depends on ld.so to do runtime library switching.
13
14 Package-Manager: Portage-2.3.52, Repoman-2.3.12
15 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
16
17 profiles/arch/amd64-fbsd/use.mask | 4 ++++
18 profiles/arch/x86-fbsd/use.mask | 4 ++++
19 profiles/features/prefix/rpath/use.mask | 3 +++
20 sci-libs/lapack/lapack-3.8.0.ebuild | 20 ++++++++++++--------
21 sci-libs/lapack/metadata.xml | 2 ++
22 5 files changed, 25 insertions(+), 8 deletions(-)
23
24 diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
25 index 09bc13e678a..d457d88580e 100644
26 --- a/profiles/arch/amd64-fbsd/use.mask
27 +++ b/profiles/arch/amd64-fbsd/use.mask
28 @@ -110,3 +110,7 @@ opencl
29 # Hans de Graaff <graaff@g.o> (27 Dec 2014)
30 # dev-libs/jemalloc is not keyworded
31 jemalloc
32 +
33 +# Benda Xu <heroxbd@g.o> (26 Jun 2019)
34 +# Not tested
35 +eselect-ldso
36 \ No newline at end of file
37
38 diff --git a/profiles/arch/x86-fbsd/use.mask b/profiles/arch/x86-fbsd/use.mask
39 index a5de147c236..6746ea43d4d 100644
40 --- a/profiles/arch/x86-fbsd/use.mask
41 +++ b/profiles/arch/x86-fbsd/use.mask
42 @@ -64,3 +64,7 @@ vaapi
43 # Chí-Thanh Christopher Nguyễn <chithanh@g.o> (22 Aug 2013)
44 # virtual/opencl is not keyworded
45 opencl
46 +
47 +# Benda Xu <heroxbd@g.o> (26 Jun 2019)
48 +# Not tested
49 +eselect-ldso
50
51 diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask
52 index 294cb12c1d1..bc446ee8012 100644
53 --- a/profiles/features/prefix/rpath/use.mask
54 +++ b/profiles/features/prefix/rpath/use.mask
55 @@ -7,3 +7,6 @@
56 # multilib is never going to work as expected in Prefix rpath
57 multilib
58
59 +# Benda Xu <heroxbd@g.o> (26 Jun 2019)
60 +# Not supported
61 +eselect-ldso
62
63 diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
64 index df848e027d5..3fb7fa9984d 100644
65 --- a/sci-libs/lapack/lapack-3.8.0.ebuild
66 +++ b/sci-libs/lapack/lapack-3.8.0.ebuild
67 @@ -11,22 +11,22 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
68
69 LICENSE="BSD"
70 SLOT="0"
71 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
72 -IUSE="lapacke doc"
73 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
74 +IUSE="lapacke doc eselect-ldso"
75 # TODO: static-libs 64bit-index
76
77 RDEPEND="
78 - >=app-eselect/eselect-blas-0.2
79 - >=app-eselect/eselect-lapack-0.2
80 + eselect-ldso? ( >=app-eselect/eselect-blas-0.2
81 + >=app-eselect/eselect-lapack-0.2 )
82 !app-eselect/eselect-cblas
83 !sci-libs/blas-reference
84 !sci-libs/cblas-reference
85 !sci-libs/lapack-reference
86 !sci-libs/lapacke-reference
87 - doc? ( app-doc/blas-docs )
88 - virtual/pkgconfig"
89 + virtual/fortran
90 + doc? ( app-doc/blas-docs )"
91 DEPEND="${RDEPEND}
92 - virtual/fortran"
93 + virtual/pkgconfig"
94
95 src_configure() {
96 local mycmakeargs=(
97 @@ -41,6 +41,7 @@ src_configure() {
98 src_install () {
99 cmake-utils_src_install
100
101 + use eselect-ldso || return
102 # Create private lib directory for eselect::blas (ld.so.conf)
103 dodir /usr/$(get_libdir)/blas/reference
104 dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
105 @@ -55,8 +56,9 @@ src_install () {
106 }
107
108 pkg_postinst () {
109 - local me=reference libdir=$(get_libdir)
110 + use eselect-ldso || return
111
112 + local me=reference libdir=$(get_libdir)
113 # check eselect-blas
114 eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
115 local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
116 @@ -83,6 +85,8 @@ pkg_postinst () {
117 }
118
119 pkg_postrm () {
120 + use eselect-ldso || return
121 +
122 eselect blas validate
123 eselect lapack validate
124 }
125
126 diff --git a/sci-libs/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
127 index 7b291ef6bfd..adc276993c4 100644
128 --- a/sci-libs/lapack/metadata.xml
129 +++ b/sci-libs/lapack/metadata.xml
130 @@ -24,5 +24,7 @@ This package installs the reference FORTRAN 77 implementation from Netlib.
131 </longdescription>
132 <use>
133 <flag name="lapacke">Build LAPACKE</flag>
134 + <flag name="eselect-ldso">Enable runtime library switching by
135 + eselect and ld.so.</flag>
136 </use>
137 </pkgmetadata>