From 209cc7709e971cdd3fa7fc7e3faa094f2b12bf22 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 28 Nov 2010 13:55:56 +0000 Subject: [PATCH] coreutils: fix build with eglibc Thank you sav for the patch. (closes #8304) SVN-Revision: 24166 --- utils/coreutils/Makefile | 11 +++++++++-- .../patches/002-fix_compile_with_uclibc.patch | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile index 2fe2d6ea1..71038822d 100644 --- a/utils/coreutils/Makefile +++ b/utils/coreutils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_VERSION:=8.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils @@ -62,11 +62,18 @@ define Package/coreutils/description sufficient and much smaller. endef +ifneq ($(CONFIG_USE_UCLIBC),) CONFIGURE_VARS += \ gl_cv_func_mbrtowc_incomplete_state=yes \ gl_cv_func_mbrtowc_retval=yes \ gl_cv_func_wcrtomb_retval=yes \ ac_cv_type_pthread_spinlock_t=no +else +CONFIGURE_VARS += \ + gl_cv_func_mbrtowc_incomplete_state=yes \ + gl_cv_func_mbrtowc_retval=yes \ + gl_cv_func_wcrtomb_retval=yes +endif CONFIGURE_ARGS += \ --enable-install-program=su diff --git a/utils/coreutils/patches/002-fix_compile_with_uclibc.patch b/utils/coreutils/patches/002-fix_compile_with_uclibc.patch index 537eab380..dffe04ed4 100644 --- a/utils/coreutils/patches/002-fix_compile_with_uclibc.patch +++ b/utils/coreutils/patches/002-fix_compile_with_uclibc.patch @@ -1,10 +1,12 @@ --- a/lib/pthread.in.h +++ b/lib/pthread.in.h -@@ -225,6 +225,7 @@ pthread_mutex_unlock (pthread_mutex_t *m +@@ -225,6 +225,9 @@ /* Approximate spinlocks with mutexes. */ ++#ifdef __UCLIBC__ +#define pthread_spinlock_t original_pthread_spinlock_t ++#endif typedef pthread_mutex_t pthread_spinlock_t; static inline int -- 2.30.2