forked from kiss-community/repo
busybox: bump, fix https://github.com/kisslinux/repo/issues/384 and https://github.com/kisslinux/repo/issues/377
This commit is contained in:
git-bruh
parent
42ab9f359e
commit
00e6e30c81
|
|
@ -9,17 +9,6 @@ sed -e "s#= g[c+][c+]#= $CC#g" \
|
|||
-e "s#\(\$(CROSS_COMPILE)\)gcc#\1$CC#g" Makefile > _
|
||||
mv -f _ Makefile
|
||||
|
||||
case $("$CC" --version) in *clang*)
|
||||
# Disable UB based optimizations which are optimized out by
|
||||
# clang and become null pointer dereferences(?).
|
||||
patch -p1 < patch-clang/fix-UB.patch
|
||||
|
||||
# Ensure that busybox's build system is aware that 'cc' may point
|
||||
# to clang rather than GCC. This is the case in non-GCC systems.
|
||||
sed "s&\(\$(CC),\)clang&\1$CC&g" Makefile.flags > _
|
||||
mv -f _ Makefile.flags
|
||||
esac
|
||||
|
||||
# Build and install regular busybox.
|
||||
# This excludes utilities which require 'suid' to function.
|
||||
make HOSTCC="$CC"
|
||||
|
|
|
|||
|
|
@ -7,12 +7,11 @@ f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396
|
|||
73be7b16dcff44e88eb48696522794f529beddf9d5a139b8a76cc8685a9f6fc8
|
||||
d70c4cd6381baeb3836c0387f53553021b48bdc851de49f1c86d836f7d0355fc
|
||||
b030d6ac2b3284cf3cc0a2eec886d26b7e09ea59feb460a6a09165da62a582b4
|
||||
c8a6fc95a75fa355d570c14e214d68a618e060a486b824b83b5140b9c6a894a7
|
||||
1e186db44b483bf9213a78bccb498d5c480757975a6032446db7d6e55a18192b
|
||||
26779d5b91c68f08cd07f64580457fa5b7041b07133931fc3060b17547051025
|
||||
2233c60d8d39fc5df845555482bc697472871ad28f249d621696a0310de30f18
|
||||
ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e
|
||||
814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12
|
||||
4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a
|
||||
f857fea99533df7b780c911bae19b0029a70ee1c8d36b49e7782604fb9cf25f8
|
||||
e7db036d8e43bb2511df087342708f5fb51d28a7dff9008a1cf440390870a972
|
||||
5ea98cc467b258c8c75e2a4e440bea509640954fe80e832cfa5e83d25a1bf3a8
|
||||
79d3959cff4858f7ff3f486f8a5c5eb09031366f1a708c74aacfa427a59359f7
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Sun Mar 6 17:37:23 2022
|
||||
# Fri Mar 11 15:22:42 2022
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ CONFIG_FEATURE_COPYBUF_KB=4
|
|||
CONFIG_MONOTONIC_SYSCALL=y
|
||||
CONFIG_IOCTL_HEX2STR_ERROR=y
|
||||
CONFIG_FEATURE_EDITING=y
|
||||
CONFIG_FEATURE_EDITING_MAX_LEN=1024
|
||||
CONFIG_FEATURE_EDITING_MAX_LEN=4096
|
||||
# CONFIG_FEATURE_EDITING_VI is not set
|
||||
CONFIG_FEATURE_EDITING_HISTORY=255
|
||||
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@ cciss!(.*) root:disk 660 =cciss/%1
|
|||
ida!(.*) root:disk 660 =ida/%1
|
||||
rd!(.*) root:disk 660 =rd/%1
|
||||
|
||||
# Input stuff.
|
||||
SUBSYSTEM=input;.* root:input 660
|
||||
|
||||
# Video stuff.
|
||||
card[0-9] root:video 660 =dri/
|
||||
vbi[0-9] root:video 660 >v4l/
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
diff --git a/coreutils/test.c b/coreutils/test.c
|
||||
index 7c65743..ac0ac4e 100644
|
||||
--- a/coreutils/test.c
|
||||
+++ b/coreutils/test.c
|
||||
@@ -435,7 +435,7 @@ struct test_statics {
|
||||
};
|
||||
|
||||
/* See test_ptr_hack.c */
|
||||
-extern struct test_statics *const test_ptr_to_statics;
|
||||
+extern struct test_statics *test_ptr_to_statics;
|
||||
|
||||
#define S (*test_ptr_to_statics)
|
||||
#define args (S.args )
|
||||
diff --git a/include/libbb.h b/include/libbb.h
|
||||
index cae5465..adbf4b8 100644
|
||||
--- a/include/libbb.h
|
||||
+++ b/include/libbb.h
|
||||
@@ -342,7 +342,7 @@ struct BUG_off_t_size_is_misdetected {
|
||||
#if defined(errno)
|
||||
/* If errno is a define, assume it's "define errno (*__errno_location())"
|
||||
* and we will cache it's result in this variable */
|
||||
-extern int *const bb_errno;
|
||||
+extern int *bb_errno;
|
||||
#undef errno
|
||||
#define errno (*bb_errno)
|
||||
#define bb_cached_errno_ptr 1
|
||||
@@ -2228,7 +2228,7 @@ struct globals;
|
||||
/* '*const' ptr makes gcc optimize code much better.
|
||||
* Magic prevents ptr_to_globals from going into rodata.
|
||||
* If you want to assign a value, use SET_PTR_TO_GLOBALS(x) */
|
||||
-extern struct globals *const ptr_to_globals;
|
||||
+extern struct globals *ptr_to_globals;
|
||||
|
||||
#if defined(__clang_major__) && __clang_major__ >= 9
|
||||
/* Clang/llvm drops assignment to "constant" storage. Silently.
|
||||
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
|
||||
index 75de88e..78ad893 100644
|
||||
--- a/libbb/lineedit.c
|
||||
+++ b/libbb/lineedit.c
|
||||
@@ -192,7 +192,7 @@ struct lineedit_statics {
|
||||
};
|
||||
|
||||
/* See lineedit_ptr_hack.c */
|
||||
-extern struct lineedit_statics *const lineedit_ptr_to_statics;
|
||||
+extern struct lineedit_statics * lineedit_ptr_to_statics;
|
||||
|
||||
#define S (*lineedit_ptr_to_statics)
|
||||
#define state (S.state )
|
||||
diff --git a/shell/ash.c b/shell/ash.c
|
||||
index f16d7fb..0eff957 100644
|
||||
--- a/shell/ash.c
|
||||
+++ b/shell/ash.c
|
||||
@@ -300,10 +300,9 @@ typedef long arith_t;
|
||||
* set "-DBB_GLOBAL_CONST=''" in CONFIG_EXTRA_CFLAGS to disable
|
||||
* this optimization.
|
||||
*/
|
||||
-#ifndef BB_GLOBAL_CONST
|
||||
-# define BB_GLOBAL_CONST const
|
||||
-#endif
|
||||
|
||||
+#undef BB_GLOBAL_CONST
|
||||
+#define BB_GLOBAL_CONST
|
||||
|
||||
/* ============ Hash table sizes. Configurable. */
|
||||
|
||||
|
|
@ -7,7 +7,6 @@ patches/install-fix-chown.patch patch
|
|||
patches/lsusb-vendor-product.patch patch
|
||||
patches/unzip-usage-no-error.patch patch
|
||||
patches/init-use-baseinit.patch patch
|
||||
patches/fix-UB.patch patch-clang
|
||||
files/.config
|
||||
files/.config-suid
|
||||
files/acpid.run
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1.35.0 1
|
||||
1.35.0 2
|
||||
|
|
|
|||
Loading…
Reference in New Issue