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

[Dave Reisner]

    Date: Friday, September 21, 2012 @ 20:40:29
  Author: dreisner
Revision: 166915

upgpkg: mkinitcpio-busybox 1.20.2-1

- add patch to avoid compile fail with glib 2.16

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

------------------+
 PKGBUILD         |    8 ++++++--
 glibc-2.16.patch |   10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-21 23:47:31 UTC (rev 166914)
+++ PKGBUILD	2012-09-22 00:40:29 UTC (rev 166915)
@@ -3,7 +3,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=mkinitcpio-busybox
-pkgver=1.20.1
+pkgver=1.20.2
 pkgrel=1
 pkgdesc="base initramfs tools"
 arch=('i686' 'x86_64')
@@ -12,8 +12,10 @@
 depends=('glibc')
 options=('!buildflags')
 source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
+        'glibc-2.16.patch'
         'config')
-sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9'
+sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882'
+            'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d'
             'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0')
 
 build() {
@@ -24,6 +26,8 @@
   sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
     "$srcdir/config" > .config
 
+  patch -Np1 < "$srcdir/glibc-2.16.patch"
+
   make
 }
 

Added: glibc-2.16.patch
===================================================================
--- glibc-2.16.patch	                        (rev 0)
+++ glibc-2.16.patch	2012-09-22 00:40:29 UTC (rev 166915)
@@ -0,0 +1,10 @@
+--- 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