Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
Date: Tue, 07 Sep 2021 17:37:49
Message-Id: 1631036182.6768e8ac2eed1314fb802d86fcd71831bb7ea2c9.floppym@gentoo
1 commit: 6768e8ac2eed1314fb802d86fcd71831bb7ea2c9
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 5 01:03:33 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 7 17:36:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6768e8ac
7
8 sys-fs/zfs: drop static libs
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 sys-fs/zfs/{zfs-0.8.6.ebuild => zfs-0.8.6-r1.ebuild} | 18 ++++++++----------
13 sys-fs/zfs/{zfs-2.0.5.ebuild => zfs-2.0.5-r1.ebuild} | 18 ++++++++----------
14 sys-fs/zfs/{zfs-2.1.0.ebuild => zfs-2.1.0-r1.ebuild} | 18 ++++++++----------
15 sys-fs/zfs/zfs-9999.ebuild | 18 ++++++++----------
16 4 files changed, 32 insertions(+), 40 deletions(-)
17
18 diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
19 similarity index 94%
20 rename from sys-fs/zfs/zfs-0.8.6.ebuild
21 rename to sys-fs/zfs/zfs-0.8.6-r1.ebuild
22 index b3237b14330..ac6c6017eaa 100644
23 --- a/sys-fs/zfs/zfs-0.8.6.ebuild
24 +++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
25 @@ -22,15 +22,15 @@ fi
26
27 LICENSE="BSD-2 CDDL MIT"
28 SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
29 -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
30 +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
31
32 DEPEND="
33 - net-libs/libtirpc[static-libs?]
34 - sys-apps/util-linux[static-libs?]
35 - sys-libs/zlib[static-libs(+)?]
36 + net-libs/libtirpc
37 + sys-apps/util-linux
38 + sys-libs/zlib
39 virtual/awk
40 - virtual/libudev[static-libs(-)?]
41 - dev-libs/openssl:0=[static-libs?]
42 + virtual/libudev:=
43 + dev-libs/openssl:0=
44 !minimal? ( ${PYTHON_DEPS} )
45 python? (
46 virtual/python-cffi[${PYTHON_USEDEP}]
47 @@ -154,7 +154,7 @@ src_configure() {
48 $(use_enable debug)
49 $(use_enable nls)
50 $(use_enable python pyzfs)
51 - $(use_enable static-libs static)
52 + --disable-static
53 $(usex minimal --without-python --with-python="${EPYTHON}")
54 )
55
56 @@ -177,9 +177,7 @@ src_install() {
57
58 use test-suite || rm -rf "${ED}/usr/share/zfs"
59
60 - if ! use static-libs; then
61 - find "${ED}/" -name '*.la' -delete || die
62 - fi
63 + find "${ED}/" -name '*.la' -delete || die
64
65 dobashcomp contrib/bash_completion.d/zfs
66 bashcomp_alias zfs zpool
67
68 diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5-r1.ebuild
69 similarity index 96%
70 rename from sys-fs/zfs/zfs-2.0.5.ebuild
71 rename to sys-fs/zfs/zfs-2.0.5-r1.ebuild
72 index 67d297759f1..6b91c6f5b81 100644
73 --- a/sys-fs/zfs/zfs-2.0.5.ebuild
74 +++ b/sys-fs/zfs/zfs-2.0.5-r1.ebuild
75 @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
76 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
77 # see libsoversion_check() below as well
78 SLOT="0/4"
79 -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
80 +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
81
82 DEPEND="
83 - net-libs/libtirpc[static-libs?]
84 - sys-apps/util-linux[static-libs?]
85 - sys-libs/zlib[static-libs(+)?]
86 - virtual/libudev[static-libs(-)?]
87 - dev-libs/openssl:0=[static-libs?]
88 + net-libs/libtirpc
89 + sys-apps/util-linux
90 + sys-libs/zlib
91 + virtual/libudev:=
92 + dev-libs/openssl:0=
93 !minimal? ( ${PYTHON_DEPS} )
94 pam? ( sys-libs/pam )
95 python? (
96 @@ -202,7 +202,7 @@ src_configure() {
97 $(use_enable nls)
98 $(use_enable pam)
99 $(use_enable python pyzfs)
100 - $(use_enable static-libs static)
101 + --disable-static
102 $(usex minimal --without-python --with-python="${EPYTHON}")
103 )
104
105 @@ -227,9 +227,7 @@ src_install() {
106
107 use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
108
109 - if ! use static-libs; then
110 - find "${ED}" -name '*.la' -delete || die
111 - fi
112 + find "${ED}" -name '*.la' -delete || die
113
114 dobashcomp contrib/bash_completion.d/zfs
115 bashcomp_alias zfs zpool
116
117 diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
118 similarity index 96%
119 rename from sys-fs/zfs/zfs-2.1.0.ebuild
120 rename to sys-fs/zfs/zfs-2.1.0-r1.ebuild
121 index 81159a7d8e2..9f8ac5af220 100644
122 --- a/sys-fs/zfs/zfs-2.1.0.ebuild
123 +++ b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
124 @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
125 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
126 # see libsoversion_check() below as well
127 SLOT="0/5"
128 -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
129 +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
130
131 DEPEND="
132 - net-libs/libtirpc[static-libs?]
133 - sys-apps/util-linux[static-libs?]
134 - sys-libs/zlib[static-libs(+)?]
135 - virtual/libudev[static-libs(-)?]
136 - dev-libs/openssl:0=[static-libs?]
137 + net-libs/libtirpc
138 + sys-apps/util-linux
139 + sys-libs/zlib
140 + virtual/libudev:=
141 + dev-libs/openssl:0=
142 !minimal? ( ${PYTHON_DEPS} )
143 pam? ( sys-libs/pam )
144 python? (
145 @@ -199,7 +199,7 @@ src_configure() {
146 $(use_enable nls)
147 $(use_enable pam)
148 $(use_enable python pyzfs)
149 - $(use_enable static-libs static)
150 + --disable-static
151 $(usex minimal --without-python --with-python="${EPYTHON}")
152 )
153
154 @@ -224,9 +224,7 @@ src_install() {
155
156 use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
157
158 - if ! use static-libs; then
159 - find "${ED}" -name '*.la' -delete || die
160 - fi
161 + find "${ED}" -name '*.la' -delete || die
162
163 dobashcomp contrib/bash_completion.d/zfs
164 bashcomp_alias zfs zpool
165
166 diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
167 index 22e4286a865..c089c475f30 100644
168 --- a/sys-fs/zfs/zfs-9999.ebuild
169 +++ b/sys-fs/zfs/zfs-9999.ebuild
170 @@ -34,14 +34,14 @@ LICENSE="BSD-2 CDDL MIT"
171 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
172 # see libsoversion_check() below as well
173 SLOT="0/5"
174 -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
175 +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
176
177 DEPEND="
178 - net-libs/libtirpc[static-libs?]
179 - sys-apps/util-linux[static-libs?]
180 - sys-libs/zlib[static-libs(+)?]
181 - virtual/libudev[static-libs(-)?]
182 - dev-libs/openssl:0=[static-libs?]
183 + net-libs/libtirpc
184 + sys-apps/util-linux
185 + sys-libs/zlib
186 + virtual/libudev:=
187 + dev-libs/openssl:0=
188 !minimal? ( ${PYTHON_DEPS} )
189 pam? ( sys-libs/pam )
190 python? (
191 @@ -201,7 +201,7 @@ src_configure() {
192 $(use_enable nls)
193 $(use_enable pam)
194 $(use_enable python pyzfs)
195 - $(use_enable static-libs static)
196 + --disable-static
197 $(usex minimal --without-python --with-python="${EPYTHON}")
198 )
199
200 @@ -226,9 +226,7 @@ src_install() {
201
202 use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
203
204 - if ! use static-libs; then
205 - find "${ED}" -name '*.la' -delete || die
206 - fi
207 + find "${ED}" -name '*.la' -delete || die
208
209 dobashcomp contrib/bash_completion.d/zfs
210 bashcomp_alias zfs zpool
Report Message
Find on MARC Find on Google Groups