mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-25 07:08:13 -07:00
app-shells/esh: revbump, fix build to work with clang16
Closes: https://bugs.gentoo.org/871351 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/27920 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic toolchain-funcs
|
||||
|
||||
@@ -19,13 +19,18 @@ DEPEND=">=sys-libs/readline-4.1:="
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-build-for-clang16.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# For some reason, this tarball has binary files in it for x86.
|
||||
# Make clean so we can rebuild for our arch and optimization.
|
||||
emake clean
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e 's|-g ||' \
|
||||
-e 's|-DMEM_DEBUG ||' \
|
||||
38
app-shells/esh/files/esh-0.8.5-fix-build-for-clang16.patch
Normal file
38
app-shells/esh/files/esh-0.8.5-fix-build-for-clang16.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
This fixes the build for clang16.
|
||||
|
||||
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
|
||||
|
||||
diff --git a/hash.c b/hash.c
|
||||
index f3d7a3d..cf3c25a 100644
|
||||
--- a/hash.c
|
||||
+++ b/hash.c
|
||||
@@ -148,7 +148,7 @@ void hash_init(hash_table* _hash_array, hash_entry data[]) {
|
||||
}
|
||||
|
||||
void hash_free(hash_table* tab,
|
||||
- void (*func)()) {
|
||||
+ void (*func)(void* data)) {
|
||||
int i;
|
||||
list* iter;
|
||||
|
||||
|
||||
--- a/read-rl.c
|
||||
+++ b/read-rl.c
|
||||
@@ -99,7 +99,7 @@ static char** rl_esh_completion(char* word, int start, int end) {
|
||||
}
|
||||
|
||||
if (openparen(rl_line_buffer[start])) {
|
||||
- return completion_matches(word, rl_find_builtin);
|
||||
+ return rl_completion_matches(word, (rl_compentry_func_t *)rl_find_builtin);
|
||||
|
||||
} else {
|
||||
return NULL;
|
||||
@@ -110,7 +110,7 @@ void read_init(void) {
|
||||
rl_bind_key('\012', rl_literal_newline);
|
||||
|
||||
/* rl_catch_signals = 0; */
|
||||
- rl_attempted_completion_function = rl_esh_completion;
|
||||
+ rl_attempted_completion_function = (rl_completion_func_t *)rl_esh_completion;
|
||||
}
|
||||
|
||||
char* read_read(char* prompt) {
|
||||
Reference in New Issue
Block a user