| 1 |
commit: b2b164ba52c04ff6fb7b8879d35f0f08ee01aed9 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Mar 29 01:00:00 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 29 17:42:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b164ba |
| 7 |
|
| 8 |
dev-db/sqlite: Fix Tcl dependency and detection. |
| 9 |
|
| 10 |
Fixes: f797e0fd4092a1d9e83c23005806a2db3d7bd0c2 |
| 11 |
Bug: https://bugs.gentoo.org/724578 |
| 12 |
Closes: https://bugs.gentoo.org/773967 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/19972 |
| 14 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-db/sqlite/sqlite-3.33.0.ebuild | 11 +++++++++-- |
| 18 |
dev-db/sqlite/sqlite-3.34.0.ebuild | 11 +++++++++-- |
| 19 |
dev-db/sqlite/sqlite-3.34.1.ebuild | 11 +++++++++-- |
| 20 |
dev-db/sqlite/sqlite-3.35.0.ebuild | 11 +++++++++-- |
| 21 |
dev-db/sqlite/sqlite-3.35.1.ebuild | 11 +++++++++-- |
| 22 |
dev-db/sqlite/sqlite-3.35.2.ebuild | 11 +++++++++-- |
| 23 |
dev-db/sqlite/sqlite-3.35.3.ebuild | 11 +++++++++-- |
| 24 |
7 files changed, 63 insertions(+), 14 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-db/sqlite/sqlite-3.33.0.ebuild b/dev-db/sqlite/sqlite-3.33.0.ebuild |
| 27 |
index 1237bba34ff..2ce5d1d4506 100644 |
| 28 |
--- a/dev-db/sqlite/sqlite-3.33.0.ebuild |
| 29 |
+++ b/dev-db/sqlite/sqlite-3.33.0.ebuild |
| 30 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 31 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 32 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 33 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 34 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 35 |
+ tools? ( dev-lang/tcl:0= )" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 38 |
|
| 39 |
@@ -274,7 +274,14 @@ multilib_src_configure() { |
| 40 |
options+=($(use_enable static-libs static)) |
| 41 |
|
| 42 |
# tcl, test, tools USE flags. |
| 43 |
- options+=(--enable-tcl) |
| 44 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 45 |
+ options+=( |
| 46 |
+ --enable-tcl |
| 47 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 48 |
+ ) |
| 49 |
+ else |
| 50 |
+ options+=(--disable-tcl) |
| 51 |
+ fi |
| 52 |
|
| 53 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 54 |
# sys/mman.h not available in MiNTLib. |
| 55 |
|
| 56 |
diff --git a/dev-db/sqlite/sqlite-3.34.0.ebuild b/dev-db/sqlite/sqlite-3.34.0.ebuild |
| 57 |
index 3e24d1239be..e9d419d08e7 100644 |
| 58 |
--- a/dev-db/sqlite/sqlite-3.34.0.ebuild |
| 59 |
+++ b/dev-db/sqlite/sqlite-3.34.0.ebuild |
| 60 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 61 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 62 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 63 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 64 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 65 |
+ tools? ( dev-lang/tcl:0= )" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 68 |
|
| 69 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 70 |
options+=($(use_enable static-libs static)) |
| 71 |
|
| 72 |
# tcl, test, tools USE flags. |
| 73 |
- options+=(--enable-tcl) |
| 74 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 75 |
+ options+=( |
| 76 |
+ --enable-tcl |
| 77 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 78 |
+ ) |
| 79 |
+ else |
| 80 |
+ options+=(--disable-tcl) |
| 81 |
+ fi |
| 82 |
|
| 83 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 84 |
# sys/mman.h not available in MiNTLib. |
| 85 |
|
| 86 |
diff --git a/dev-db/sqlite/sqlite-3.34.1.ebuild b/dev-db/sqlite/sqlite-3.34.1.ebuild |
| 87 |
index 24baff37d52..623578707fa 100644 |
| 88 |
--- a/dev-db/sqlite/sqlite-3.34.1.ebuild |
| 89 |
+++ b/dev-db/sqlite/sqlite-3.34.1.ebuild |
| 90 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 91 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 92 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 93 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 94 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 95 |
+ tools? ( dev-lang/tcl:0= )" |
| 96 |
DEPEND="${RDEPEND} |
| 97 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 98 |
|
| 99 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 100 |
options+=($(use_enable static-libs static)) |
| 101 |
|
| 102 |
# tcl, test, tools USE flags. |
| 103 |
- options+=(--enable-tcl) |
| 104 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 105 |
+ options+=( |
| 106 |
+ --enable-tcl |
| 107 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 108 |
+ ) |
| 109 |
+ else |
| 110 |
+ options+=(--disable-tcl) |
| 111 |
+ fi |
| 112 |
|
| 113 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 114 |
# sys/mman.h not available in MiNTLib. |
| 115 |
|
| 116 |
diff --git a/dev-db/sqlite/sqlite-3.35.0.ebuild b/dev-db/sqlite/sqlite-3.35.0.ebuild |
| 117 |
index d04438ce2cb..e1762793c34 100644 |
| 118 |
--- a/dev-db/sqlite/sqlite-3.35.0.ebuild |
| 119 |
+++ b/dev-db/sqlite/sqlite-3.35.0.ebuild |
| 120 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 121 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 122 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 123 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 124 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 125 |
+ tools? ( dev-lang/tcl:0= )" |
| 126 |
DEPEND="${RDEPEND} |
| 127 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 128 |
|
| 129 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 130 |
options+=($(use_enable static-libs static)) |
| 131 |
|
| 132 |
# tcl, test, tools USE flags. |
| 133 |
- options+=(--enable-tcl) |
| 134 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 135 |
+ options+=( |
| 136 |
+ --enable-tcl |
| 137 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 138 |
+ ) |
| 139 |
+ else |
| 140 |
+ options+=(--disable-tcl) |
| 141 |
+ fi |
| 142 |
|
| 143 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 144 |
# sys/mman.h not available in MiNTLib. |
| 145 |
|
| 146 |
diff --git a/dev-db/sqlite/sqlite-3.35.1.ebuild b/dev-db/sqlite/sqlite-3.35.1.ebuild |
| 147 |
index d04438ce2cb..e1762793c34 100644 |
| 148 |
--- a/dev-db/sqlite/sqlite-3.35.1.ebuild |
| 149 |
+++ b/dev-db/sqlite/sqlite-3.35.1.ebuild |
| 150 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 151 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 152 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 153 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 154 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 155 |
+ tools? ( dev-lang/tcl:0= )" |
| 156 |
DEPEND="${RDEPEND} |
| 157 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 158 |
|
| 159 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 160 |
options+=($(use_enable static-libs static)) |
| 161 |
|
| 162 |
# tcl, test, tools USE flags. |
| 163 |
- options+=(--enable-tcl) |
| 164 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 165 |
+ options+=( |
| 166 |
+ --enable-tcl |
| 167 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 168 |
+ ) |
| 169 |
+ else |
| 170 |
+ options+=(--disable-tcl) |
| 171 |
+ fi |
| 172 |
|
| 173 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 174 |
# sys/mman.h not available in MiNTLib. |
| 175 |
|
| 176 |
diff --git a/dev-db/sqlite/sqlite-3.35.2.ebuild b/dev-db/sqlite/sqlite-3.35.2.ebuild |
| 177 |
index d04438ce2cb..e1762793c34 100644 |
| 178 |
--- a/dev-db/sqlite/sqlite-3.35.2.ebuild |
| 179 |
+++ b/dev-db/sqlite/sqlite-3.35.2.ebuild |
| 180 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 181 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 182 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 183 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 184 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 185 |
+ tools? ( dev-lang/tcl:0= )" |
| 186 |
DEPEND="${RDEPEND} |
| 187 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 188 |
|
| 189 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 190 |
options+=($(use_enable static-libs static)) |
| 191 |
|
| 192 |
# tcl, test, tools USE flags. |
| 193 |
- options+=(--enable-tcl) |
| 194 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 195 |
+ options+=( |
| 196 |
+ --enable-tcl |
| 197 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 198 |
+ ) |
| 199 |
+ else |
| 200 |
+ options+=(--disable-tcl) |
| 201 |
+ fi |
| 202 |
|
| 203 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 204 |
# sys/mman.h not available in MiNTLib. |
| 205 |
|
| 206 |
diff --git a/dev-db/sqlite/sqlite-3.35.3.ebuild b/dev-db/sqlite/sqlite-3.35.3.ebuild |
| 207 |
index d04438ce2cb..e1762793c34 100644 |
| 208 |
--- a/dev-db/sqlite/sqlite-3.35.3.ebuild |
| 209 |
+++ b/dev-db/sqlite/sqlite-3.35.3.ebuild |
| 210 |
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
| 211 |
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
| 212 |
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
| 213 |
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
| 214 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
| 215 |
+ tools? ( dev-lang/tcl:0= )" |
| 216 |
DEPEND="${RDEPEND} |
| 217 |
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
| 218 |
|
| 219 |
@@ -311,7 +311,14 @@ multilib_src_configure() { |
| 220 |
options+=($(use_enable static-libs static)) |
| 221 |
|
| 222 |
# tcl, test, tools USE flags. |
| 223 |
- options+=(--enable-tcl) |
| 224 |
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
| 225 |
+ options+=( |
| 226 |
+ --enable-tcl |
| 227 |
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
| 228 |
+ ) |
| 229 |
+ else |
| 230 |
+ options+=(--disable-tcl) |
| 231 |
+ fi |
| 232 |
|
| 233 |
if [[ "${CHOST}" == *-mint* ]]; then |
| 234 |
# sys/mman.h not available in MiNTLib. |
Archives