busybox: Fix config. MSYS2 have MEMCHR.

This commit is contained in:
Alexpux
2014-10-20 11:24:16 +04:00
parent 59afffa7d9
commit 665fdcecf8
3 changed files with 19 additions and 16 deletions

View File

@@ -5,7 +5,7 @@ pkgver=1.22.1
pkgrel=1
pkgdesc="BusyBox: The Swiss Army Knife of Embedded Linux"
arch=('i686' 'x86_64')
url="http://gondor.apana.org.au/~herbert/dash/"
url="http://www.busybox.net/"
license=('GPL2')
depends=('msys2-base' 'msys2-runtime')
groups=('base')
@@ -15,10 +15,10 @@ source=("http://busybox.net/downloads/${pkgname}-${pkgver}.tar.bz2"
"fixsyscalls.patch"
"msys2.config")
sha1sums=('SKIP'
'SKIP'
'SKIP'
'SKIP')
sha1sums=('d6e96fefb6f0fb8079f27468b9bf22d8dd96108e'
'618aef530d44a92eb313742e105e48887b2e03bf'
'060e6b5d06ac5f9034a4857c37259d346df9eb5a'
'48f00383699e1a54440c6ef87f8097eeae3d2815')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,7 +30,8 @@ prepare() {
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
#make oldconfig
CFLAGS='-O2 -static-libgcc' make
#CFLAGS='-O2 -static-libgcc'
make
}
package() {

View File

@@ -37,7 +37,11 @@ diff --git a/include/platform.h b/include/platform.h
index 60864c9..4162373 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -414,6 +414,16 @@
@@ -414,10 +414,19 @@
#if defined(__CYGWIN__)
# undef HAVE_CLEARENV
# undef HAVE_FDPRINTF
-# undef HAVE_MEMRCHR
# undef HAVE_PTSNAME_R
# undef HAVE_STRVERSCMP
# undef HAVE_UNLOCKED_LINE_OPS

View File

@@ -28,8 +28,8 @@ CONFIG_FEATURE_INSTALLER=y
CONFIG_UNICODE_SUPPORT=y
# CONFIG_UNICODE_USING_LOCALE is not set
# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
CONFIG_SUBST_WCHAR=63
CONFIG_LAST_SUPPORTED_WCHAR=767
CONFIG_SUBST_WCHAR=65533
CONFIG_LAST_SUPPORTED_WCHAR=0
# CONFIG_UNICODE_COMBINING_WCHARS is not set
# CONFIG_UNICODE_WIDE_WCHARS is not set
# CONFIG_UNICODE_BIDI_SUPPORT is not set
@@ -54,7 +54,7 @@ CONFIG_FEATURE_SYSLOG=y
#
# Build Options
#
# CONFIG_STATIC is not set
CONFIG_STATIC=y
# CONFIG_PIE is not set
# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
@@ -63,7 +63,7 @@ CONFIG_FEATURE_SYSLOG=y
CONFIG_LFS=y
CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
CONFIG_EXTRA_CFLAGS=""
CONFIG_EXTRA_CFLAGS="-O2 -static-libgcc"
CONFIG_EXTRA_LDFLAGS=""
CONFIG_EXTRA_LDLIBS=""
@@ -193,8 +193,6 @@ CONFIG_FEATURE_TR_EQUIV=y
CONFIG_BASE64=y
# CONFIG_WHO is not set
# CONFIG_USERS is not set
# CONFIG_WHO is not set
# CONFIG_USERS is not set
CONFIG_CAL=y
CONFIG_CATV=y
CONFIG_CHGRP=y
@@ -916,7 +914,7 @@ CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
CONFIG_PKILL=y
CONFIG_PS=y
# CONFIG_FEATURE_PS_WIDE is not set
CONFIG_FEATURE_PS_WIDE=y
# CONFIG_FEATURE_PS_LONG is not set
# CONFIG_FEATURE_PS_TIME is not set
CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
@@ -973,7 +971,7 @@ CONFIG_ASH_CMDCMD=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_RANDOM_SUPPORT=y
CONFIG_ASH_EXPAND_PRMT=y
CONFIG_CTTYHACK=y
# CONFIG_CTTYHACK is not set
CONFIG_HUSH=y
CONFIG_HUSH_BASH_COMPAT=y
CONFIG_HUSH_BRACE_EXPANSION=y
@@ -1017,7 +1015,7 @@ CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
CONFIG_FEATURE_KMSG_SYSLOG=y
# CONFIG_FEATURE_KMSG_SYSLOG is not set
# CONFIG_KLOGD is not set
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
CONFIG_LOGGER=y