diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 56cb1e4df..da290b426 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -8,7 +8,7 @@ pkgname=mkinitcpio-busybox pkgver=1.25.1 -pkgrel=1 +pkgrel=2 pkgdesc='Base initramfs tools' arch=('i686' 'x86_64') url="http://www.busybox.net/" @@ -16,7 +16,6 @@ license=('GPL') depends=('glibc') options=('!buildflags') source=("https://busybox.net/downloads/busybox-$pkgver.tar.bz2" - 'glibc-2.16.patch' 'config') sha256sums=('27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' @@ -39,7 +38,10 @@ prepare() { sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config - patch -Np1 <"$srcdir/glibc-2.16.patch" + # workaround for FS#54240 + if [[ $CARCH == 'i686' ]]; then + echo 'CONFIG_STATIC=y' >> .config + fi } build() { diff --git a/core/mkinitcpio-busybox/glibc-2.16.patch b/core/mkinitcpio-busybox/glibc-2.16.patch deleted file mode 100644 index 5e2fb4fa5..000000000 --- a/core/mkinitcpio-busybox/glibc-2.16.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/libbb.h.orig 2012-09-17 08:28:35.215518120 -0400 -+++ b/include/libbb.h 2012-09-17 08:28:49.807212925 -0400 -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - #ifndef major - # include - #endif