[arch-commits] Commit in mkinitcpio-busybox/trunk (PKGBUILD glibc-2.16.patch)

[Bartłomiej Piotrowski]

    Date: Wednesday, June 7, 2017 @ 09:29:47
  Author: bpiotrowski
Revision: 298122

1.25.1-2: link statically i686 due to segfaults (FS#54240)

Modified:
  mkinitcpio-busybox/trunk/PKGBUILD
Deleted:
  mkinitcpio-busybox/trunk/glibc-2.16.patch

------------------+
 PKGBUILD         |   11 ++++++-----
 glibc-2.16.patch |   10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-07 07:37:48 UTC (rev 298121)
+++ PKGBUILD	2017-06-07 09:29:47 UTC (rev 298122)
@@ -5,18 +5,16 @@
 
 pkgname=mkinitcpio-busybox
 pkgver=1.25.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Base initramfs tools'
 arch=('i686' 'x86_64')
 url="http://www.busybox.net/"
 license=('GPL')
-depends=('glibc')
+depends_x86_64=('glibc')
 options=('!buildflags')
 source=("https://busybox.net/downloads/busybox-$pkgver.tar.bz2"
-        'glibc-2.16.patch'
         'config')
 sha256sums=('27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e'
-            'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d'
             'd916c75c3c4627e1155c9dc40bab5fe7890fbf45d6a3bcda4936f1c5b80f7d7f')
 
 prepare() {
@@ -26,7 +24,10 @@
 
   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() {

Deleted: glibc-2.16.patch
===================================================================
--- glibc-2.16.patch	2017-06-07 07:37:48 UTC (rev 298121)
+++ glibc-2.16.patch	2017-06-07 09:29:47 UTC (rev 298122)
@@ -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 <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #ifndef major
- # include <sys/sysmacros.h>
- #endif