[arch-commits] Commit in mkinitcpio-busybox/trunk (PKGBUILD config)

[Thomas Bächler]

    Date: Tuesday, January 5, 2010 @ 17:50:30
  Author: thomas
Revision: 62258

mkinitcpio-busybox: Use glibc instead of uclibc

Modified:
  mkinitcpio-busybox/trunk/PKGBUILD
  mkinitcpio-busybox/trunk/config

----------+
 PKGBUILD |   16 ++++++++--------
 config   |    6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-05 21:48:01 UTC (rev 62257)
+++ PKGBUILD	2010-01-05 22:50:30 UTC (rev 62258)
@@ -1,28 +1,28 @@
 # $Id$
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=mkinitcpio-busybox
-pkgver=1.15.1
+pkgver=1.15.3
 pkgrel=1
 pkgdesc="base initramfs tools"
 arch=('i686' 'x86_64')
 url="http://www.busybox.net/"
 license=('GPL')
-depends=('uclibc-runtime')
-makedepends=('uclibc' 'gcc-uclibc')
+depends=('glibc')
 source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2
         config)
-sha256sums=('7f623cb0c9281aefafeacf3b4f925debc7516d263ff469a82e548da415e575cd'
-            '1d3eaf5d2272eff8dc3d0b95f4427d7de834567bd313a0f6506c38fa7b027538')
+sha256sums=('d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb'
+            'a4c2409bf6ad981af85195113d76f73a93872752ce7e4c83f84f23f47f4512c1')
 
 build() {
   cd "${srcdir}/busybox-${pkgver}"
 
+  unset CFLAGS CXXFLAGS
   if [ ${CARCH} = "x86_64" ]; then
-    sed 's|^CONFIG_CROSS_COMPILER_PREFIX=.*|CONFIG_CROSS_COMPILER_PREFIX="x86_64-unknown-linux-uclibc-"|' "${srcdir}/config" > .config
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe"|' "${srcdir}/config" > .config
   else
-    sed 's|^CONFIG_CROSS_COMPILER_PREFIX=.*|CONFIG_CROSS_COMPILER_PREFIX="i686-pc-linux-uclibc-"|' "${srcdir}/config" > .config
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe"|' "${srcdir}/config" > .config
   fi
   make || return 1
-  install -D -m755 busybox "${pkgdir}/usr/lib/initramfs/base/busybox"
+  install -D -m755 busybox "${pkgdir}/lib/initcpio/busybox"
 }
 # vim:set ts=2 sw=2 et:

Modified: config
===================================================================
--- config	2010-01-05 21:48:01 UTC (rev 62257)
+++ config	2010-01-05 22:50:30 UTC (rev 62258)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.15.1
-# Tue Sep 22 11:32:25 2009
+# Busybox version: 1.15.3
+# Tue Jan  5 18:17:57 2010
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -47,7 +47,7 @@
 # CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 # CONFIG_LFS is not set
-CONFIG_CROSS_COMPILER_PREFIX="x86_64-unknown-linux-uclibc-"
+CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_EXTRA_CFLAGS=""
 
 #