uclibc: update to 1.0.20
The test suite is removed from the package and is already a separate package in buildroot. All patches are upstream, so remove them. The UCLIBC_HAS_LFS option is removed upstream. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> [Thomas: remove BR2_UCLIBC_INSTALL_TEST_SUITE option, add it to Config.in.legacy.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Waldemar Brodkorb
Thomas Petazzoni
parent
9b4218f4f4
commit
a44d7f2dbb
@ -145,6 +145,14 @@ endif
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2017.02"
|
||||
|
||||
config BR2_UCLIBC_INSTALL_TEST_SUITE
|
||||
bool "uClibc tests now in uclibc-ng-test"
|
||||
select BR2_LEGACY
|
||||
select BR2_PACKAGE_UCLIBC_NG_TEST
|
||||
help
|
||||
The test suite of the uClibc C library has been moved into a
|
||||
separate package, uclibc-ng-test.
|
||||
|
||||
config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
bool "Blackfin.uclinux.org 2014R1 toolchain removed"
|
||||
select BR2_LEGACY
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 543308f6c46cf2edf8a524bc9c631e472570fe72 Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||||
Date: Mon, 24 Oct 2016 05:15:07 +0200
|
||||
Subject: [PATCH] linuxthreads: add back signal.h
|
||||
|
||||
Somehow this got removed with f1d7505e40654a185843bdc8f1cf1fd00ab55c04.
|
||||
|
||||
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||||
---
|
||||
libpthread/linuxthreads/sysdeps/pthread/pthread.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
|
||||
index cf043b5..cc13a52 100644
|
||||
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h
|
||||
+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <sched.h>
|
||||
#include <time.h>
|
||||
|
||||
+#include <signal.h>
|
||||
#include <bits/pthreadtypes.h>
|
||||
#include <bits/initspin.h>
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From 2ca4e8dcbd35e5c6da41a195550d741ccb2f7978 Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||||
Date: Sat, 26 Nov 2016 19:47:41 +0100
|
||||
Subject: [PATCH] do not define madvise related macros for noMMU targets
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||||
---
|
||||
libc/sysdeps/linux/common/bits/mman-common.h | 41 +++++++++++++++-------------
|
||||
1 file changed, 22 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h
|
||||
index 6cde5da..5b20da4 100644
|
||||
--- a/libc/sysdeps/linux/common/bits/mman-common.h
|
||||
+++ b/libc/sysdeps/linux/common/bits/mman-common.h
|
||||
@@ -83,26 +83,29 @@
|
||||
# define MREMAP_FIXED 2
|
||||
#endif
|
||||
|
||||
+/* only define for MMU targets, no-MMU does not support madvise. */
|
||||
+#ifdef __ARCH_USE_MMU__
|
||||
/* Advice to `madvise'. */
|
||||
-#ifdef __USE_BSD
|
||||
-# define MADV_NORMAL 0 /* No further special treatment. */
|
||||
-# define MADV_RANDOM 1 /* Expect random page references. */
|
||||
-# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */
|
||||
-# define MADV_WILLNEED 3 /* Will need these pages. */
|
||||
-# define MADV_DONTNEED 4 /* Don't need these pages. */
|
||||
-# define MADV_REMOVE 9 /* Remove these pages and resources. */
|
||||
-# define MADV_DONTFORK 10 /* Do not inherit across fork. */
|
||||
-# define MADV_DOFORK 11 /* Do inherit across fork. */
|
||||
-# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */
|
||||
-# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */
|
||||
-# define MADV_HWPOISON 100 /* Poison a page for testing. */
|
||||
-#endif
|
||||
+# ifdef __USE_BSD
|
||||
+# define MADV_NORMAL 0 /* No further special treatment. */
|
||||
+# define MADV_RANDOM 1 /* Expect random page references. */
|
||||
+# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */
|
||||
+# define MADV_WILLNEED 3 /* Will need these pages. */
|
||||
+# define MADV_DONTNEED 4 /* Don't need these pages. */
|
||||
+# define MADV_REMOVE 9 /* Remove these pages and resources. */
|
||||
+# define MADV_DONTFORK 10 /* Do not inherit across fork. */
|
||||
+# define MADV_DOFORK 11 /* Do inherit across fork. */
|
||||
+# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */
|
||||
+# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */
|
||||
+# define MADV_HWPOISON 100 /* Poison a page for testing. */
|
||||
+# endif
|
||||
|
||||
/* The POSIX people had to invent similar names for the same things. */
|
||||
-#ifdef __USE_XOPEN2K
|
||||
-# define POSIX_MADV_NORMAL 0 /* No further special treatment. */
|
||||
-# define POSIX_MADV_RANDOM 1 /* Expect random page references. */
|
||||
-# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */
|
||||
-# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
|
||||
-# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
|
||||
+# ifdef __USE_XOPEN2K
|
||||
+# define POSIX_MADV_NORMAL 0 /* No further special treatment. */
|
||||
+# define POSIX_MADV_RANDOM 1 /* Expect random page references. */
|
||||
+# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */
|
||||
+# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
|
||||
+# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
|
||||
+# endif
|
||||
#endif
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 9945c6d21797553e78cbef8034f6dd16b3824df5 Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@openadk.org>
|
||||
Date: Mon, 28 Nov 2016 07:31:00 +0100
|
||||
Subject: [PATCH] posix_madvise not available for noMMU
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
libc/sysdeps/linux/common/posix_madvise.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/posix_madvise.c b/libc/sysdeps/linux/common/posix_madvise.c
|
||||
index 2f95bcb..541dabe 100644
|
||||
--- a/libc/sysdeps/linux/common/posix_madvise.c
|
||||
+++ b/libc/sysdeps/linux/common/posix_madvise.c
|
||||
@@ -4,6 +4,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
+#ifdef __ARCH_USE_MMU__
|
||||
#if defined __NR_madvise && defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
|
||||
int posix_madvise(void *addr, size_t len, int advice)
|
||||
{
|
||||
@@ -23,3 +24,4 @@ int posix_madvise(void *addr, size_t len, int advice)
|
||||
return INTERNAL_SYSCALL_ERRNO (result, err);
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -95,22 +95,6 @@ config BR2_UCLIBC_INSTALL_UTILS
|
||||
You can save ~32 KiB in target space by disabling them since
|
||||
they're normally not needed.
|
||||
|
||||
config BR2_UCLIBC_INSTALL_TEST_SUITE
|
||||
bool "Compile and install uClibc tests"
|
||||
help
|
||||
Enabling this option will compile and install the uClibc test suite.
|
||||
This is useful if you want to check if the uClibc library is working
|
||||
for your architecture and/or help developing uClibc.
|
||||
|
||||
The test suite will be installed into /root/uClibc directory. To run
|
||||
the test suite enter the /root/uClibc/test directory and type
|
||||
"sh uclibcng-testrunner.sh".
|
||||
|
||||
See the /root/uClibc/test/README for additional information.
|
||||
|
||||
This is not needed at all for normal builds, so you can safely say no
|
||||
if you do not plan to dig into your C library.
|
||||
|
||||
# Mapping from the Buildroot architecture configuration options to the
|
||||
# uClibc architecture names.
|
||||
config BR2_UCLIBC_TARGET_ARCH
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# From http://www.uclibc-ng.org/
|
||||
sha256 b3f94d67e9afcefb158a37011584e0d41ef3bd55ad72255a26abb25ad49b77a1 uClibc-ng-1.0.19.tar.xz
|
||||
sha256 1c817672a65cf9132c98f84e1b8445650de1c18eca258f49c0050b420a25e946 uClibc-ng-1.0.20.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UCLIBC_VERSION = 1.0.19
|
||||
UCLIBC_VERSION = 1.0.20
|
||||
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
|
||||
UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
|
||||
UCLIBC_LICENSE = LGPLv2.1+
|
||||
@ -247,14 +247,6 @@ define UCLIBC_ENDIAN_CONFIG
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# Largefile
|
||||
#
|
||||
|
||||
define UCLIBC_LARGEFILE_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LFS,$(@D)/.config)
|
||||
endef
|
||||
|
||||
#
|
||||
# MMU
|
||||
#
|
||||
@ -445,16 +437,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
|
||||
$(UCLIBC_SHARED_LIBS_CONFIG)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
|
||||
define UCLIBC_BUILD_TEST_SUITE
|
||||
$(MAKE) -C $(@D) \
|
||||
$(UCLIBC_MAKE_FLAGS) \
|
||||
TEST_INSTALLED_UCLIBC=1 \
|
||||
UCLIBC_ONLY=1 \
|
||||
test_compile test_gen
|
||||
endef
|
||||
endif
|
||||
|
||||
define UCLIBC_BUILD_CMDS
|
||||
$(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) headers
|
||||
$(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS)
|
||||
@ -463,14 +445,6 @@ define UCLIBC_BUILD_CMDS
|
||||
HOSTCC="$(HOSTCC)" hostutils
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
|
||||
define UCLIBC_INSTALL_TEST_SUITE
|
||||
mkdir -p $(TARGET_DIR)/root/uClibc
|
||||
cp -rdpf $(@D)/test $(TARGET_DIR)/root/uClibc
|
||||
find $(TARGET_DIR)/root/uClibc -name \*.o -exec rm {} \;
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_UCLIBC_INSTALL_UTILS),y)
|
||||
define UCLIBC_INSTALL_UTILS_TARGET
|
||||
$(MAKE1) -C $(@D) \
|
||||
@ -489,8 +463,6 @@ define UCLIBC_INSTALL_TARGET_CMDS
|
||||
RUNTIME_PREFIX=/ \
|
||||
install_runtime
|
||||
$(UCLIBC_INSTALL_UTILS_TARGET)
|
||||
$(UCLIBC_BUILD_TEST_SUITE)
|
||||
$(UCLIBC_INSTALL_TEST_SUITE)
|
||||
$(UCLIBC_INSTALL_LDSO_SYMLINKS)
|
||||
endef
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user