diff --git a/srcpkgs/busybox-initramfs/files/dotconfig b/srcpkgs/busybox-initramfs/files/dotconfig index b79b14ea36..b54704ee53 100644 --- a/srcpkgs/busybox-initramfs/files/dotconfig +++ b/srcpkgs/busybox-initramfs/files/dotconfig @@ -23,8 +23,8 @@ CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_FEATURE_ASSUME_UNICODE=y # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set # CONFIG_LONG_OPTS is not set # CONFIG_FEATURE_DEVPTS is not set diff --git a/srcpkgs/busybox-initramfs/template b/srcpkgs/busybox-initramfs/template index cc97af618b..ac4c8a5e4b 100644 --- a/srcpkgs/busybox-initramfs/template +++ b/srcpkgs/busybox-initramfs/template @@ -1,7 +1,7 @@ # Build template for 'busybox-initramfs'. pkgname=busybox-initramfs version=1.16.1 -revision=2 +revision=3 wrksrc=busybox-$version distfiles="http://www.busybox.net/downloads/busybox-$version.tar.bz2" build_style=gnu_makefile @@ -21,13 +21,16 @@ long_desc=" This package provides some required utilities for the initial ramdisks." -# Workaround for broken binary with gcc 4.5, solution here: -# http://gcc.gnu.org/ml/gcc-bugs/2010-05/msg00432.html -CFLAGS="-fno-tree-pta" base_chroot=yes Add_dependency run glibc pre_build() { cp -f ${FILESDIR}/dotconfig ${wrksrc}/.config + # -fno-tree-pta is required to work around a bug in gcc 4.5.0 + # A patch is scheduled to be backported to 4.5.1, so we can remove it + # once that is released. + # Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43987 + sed -i 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-O0 -fno-strict-aliasing"|' \ + ${wrksrc}/.config }