aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2021-01-23 04:52:39 +0100
committerAriadne Conill <ariadne@dereferenced.org>2021-04-21 09:14:18 +0000
commit33752a28a98a0ae1f5130d30fc9c045cd4c62546 (patch)
treeb13f8311005b4c9dca9fa49649428bd0bc97f2ba
parent9345f91d2e856cab03fa01916407ebc3c5e340cd (diff)
main/busybox: disable CONFIG_STATIC_LIBGCC for non-static builds
Previously, busybox linked statically against libgcc unconditionally with release 1.33.0 this become configurable [1]. Linking dynamically against libgcc should result in a size decrease. [1]: https://git.busybox.net/busybox/commit/?id=39646dce329c1b88b1de8ef0c450813765fda202
-rw-r--r--main/busybox/APKBUILD12
-rw-r--r--main/busybox/busyboxconfig4
-rw-r--r--main/busybox/busyboxconfig-extras4
3 files changed, 9 insertions, 11 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 82f7a7c072a..259cd12ee17 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.33.0
-pkgrel=6
+pkgrel=7
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -231,8 +231,7 @@ ifupdown() {
mkdir -p "$subpkgdir"
}
-sha512sums="
-20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a busybox-1.33.0.tar.bz2
+sha512sums="20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a busybox-1.33.0.tar.bz2
84a6599d327d33350432d1f332006d8ce04363ecc53836a98a6180e0cc32fbc4f12c3f9f2b112a1cb2e787dce705b04562347d008465256e796c808433a188b6 0001-lineedit-fix-tab-completion-with-equal-sign.patch
ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353 0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302 0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
@@ -252,10 +251,9 @@ d12246f1134bbd3993462d27172c4739cc601b251d57ce8e088745773afa965551236e8cb8b9013d
20b4eef2704d812da477f329fa0b6d83c46b5a6cd748bd2a15e37d08ce05c627df653f26db1faf94fa9926d7b75b27bf6aeba4bbbb4e96af32c1b63e0676a8fa 0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
c6dc917e67ab4c9aa0294f22707fd3cfc8cb37d703d8a0bce7f257ac9fb931dc4b815ab1d5e4f3ed3520b6ba046bdc1fbd0d1f8ed73b8d2d51f9238f03e03688 traceroute-opt-x.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate
-12a3c22a350892dd490edcdab3eeb19396cb20893967a4354252111b97ace0cda87dd2b60ef5a1ad35228fabd108083dd3ab3b27feca4ec8d09490e58f9f51d8 busyboxconfig
-fe9fd2c46b7fba920e5c588d69b35858129100e7ec6bf4ea747ef7823e096bea135dab42e1bc37a9fb285193c8d611621d6c85d9aaa63eaf9bfcb6ce3a525b3b busyboxconfig-extras
+5b0adc5bbe3d539380007ccc2e90ee1c986d24eae29b5e04b65a1e18988dc18907e7f617c7b3eb66ce131fdcb2de78da8b7653f58f95347d286fe5d17c6118f8 busyboxconfig
+470a646505887dbf20dd8c3c3b5c8ab25f363f3a0bfbca577de115b8ec61f28e9843f4f3a7978c634e863dbf28bae987f20e7fa1aa529450ff6c17bc188cae53 busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
-c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script
-"
+c3194ccffe7300a0f55d50fb56d38c8df55d588adac13056fd0be2676594974477f94de5570a5a882bc864c3711cf67aa43b6ad6808e672f4533dd0f7363d2f5 default.script"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 6cf101b1e62..1767540299e 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.33.0
-# Fri Jan 8 19:34:17 2021
+# Sat Jan 23 11:56:15 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -54,7 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
-CONFIG_STATIC_LIBGCC=y
+# CONFIG_STATIC_LIBGCC is not set
#
# Installation Options ("make install" behavior)
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index c76cba66448..78412c8c96d 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.33.0
-# Fri Jan 8 19:34:47 2021
+# Sat Jan 23 11:57:08 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -54,7 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
-CONFIG_STATIC_LIBGCC=y
+# CONFIG_STATIC_LIBGCC is not set
#
# Installation Options ("make install" behavior)