bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coreutils: fix build with eglibc

Browse Source 
Thank you sav for the patch. (closes #8304)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@24166 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2010-11-28 13:55:56 +00:00
parent 113e7f3e45
commit 9ed406329d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/coreutils/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coreutils PKG_NAME:=coreutils
PKG_VERSION:=8.7 PKG_VERSION:=8.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/coreutils PKG_SOURCE_URL:=@GNU/coreutils
@ -62,11 +62,18 @@ define Package/coreutils/description
sufficient and much smaller. sufficient and much smaller.
endef endef
ifneq ($(CONFIG_USE_UCLIBC),)
CONFIGURE_VARS += \ CONFIGURE_VARS += \
gl_cv_func_mbrtowc_incomplete_state=yes \ gl_cv_func_mbrtowc_incomplete_state=yes \
gl_cv_func_mbrtowc_retval=yes \ gl_cv_func_mbrtowc_retval=yes \
gl_cv_func_wcrtomb_retval=yes \ gl_cv_func_wcrtomb_retval=yes \
ac_cv_type_pthread_spinlock_t=no 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 += \ CONFIGURE_ARGS += \
--enable-install-program=su --enable-install-program=su

4
utils/coreutils/patches/002-fix_compile_with_uclibc.patch
View File

@ -1,10 +1,12 @@
--- a/lib/pthread.in.h --- a/lib/pthread.in.h
+++ b/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. */ /* Approximate spinlocks with mutexes. */
+#ifdef __UCLIBC__
+#define pthread_spinlock_t original_pthread_spinlock_t +#define pthread_spinlock_t original_pthread_spinlock_t
+#endif
typedef pthread_mutex_t pthread_spinlock_t; typedef pthread_mutex_t pthread_spinlock_t;
static inline int static inline int