Skip to contentSkip to conversation

uclibc: update to 1.0.21

PATCH New Waldemar Brodkorb 3 participants 3 messages Dec 26, 2016 – Dec 29, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uclibc: update to 1.0.21

Remove all patches as they are upstream.
Remove MALLOC_GLIBC_COMPAT and UCLIBC_HAS_OBSTACK as they got removed.

---
the patch shouldn't be applied before:
busybox: fix modutils compile

---
 ...s-linux-common-madvise.c-disable-on-noMMU.patch | 31 --------
 ...-mman.h-remove-madvise-posix_madvise-prot.patch | 36 ----------
 package/uclibc/0003-bfin-fix-a-gcc-warning.patch   | 25 -------
 ...4-fix-static-linking-for-FDPIC-toolchains.patch | 49 -------------
 .../uclibc/0005-xtensa-fix-static-linking.patch    | 60 ----------------
 ...ads-optimize-single-threaded-applications.patch | 83 ----------------------
 ...-add-definition-of-__attribute_alloc_size.patch | 42 -----------
 package/uclibc/uClibc-ng.config                    |  2 -
 package/uclibc/uclibc.hash                         |  2 +-
 package/uclibc/uclibc.mk                           |  2 +-
 10 files changed, 2 insertions(+), 330 deletions(-)
 delete mode 100644 package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch
 delete mode 100644 package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch
 delete mode 100644 package/uclibc/0003-bfin-fix-a-gcc-warning.patch
 delete mode 100644 package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch
 delete mode 100644 package/uclibc/0005-xtensa-fix-static-linking.patch
 delete mode 100644 package/uclibc/0006-threads-optimize-single-threaded-applications.patch
 delete mode 100644 package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch
package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch deleted +0 -31
deleted file mode 100644
index bc97153..0000000
@@ -1,31 +0,0 @@
-From bf7a84dc1fd8c9c340222260cb3e53019715088c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Wed, 7 Dec 2016 23:18:49 +0100
-Subject: [PATCH] libc/sysdeps/linux/common/madvise.c: disable on noMMU
- architectures
-
-Similar to what was done in commit
-9945c6d21797553e78cbef8034f6dd16b3824df5 for posix_madvise().
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- libc/sysdeps/linux/common/madvise.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libc/sysdeps/linux/common/madvise.c b/libc/sysdeps/linux/common/madvise.c
-index e953d7b..bb486d2 100644
---- a/libc/sysdeps/linux/common/madvise.c
-+++ b/libc/sysdeps/linux/common/madvise.c
-@@ -9,6 +9,8 @@
- 
- #include <sys/syscall.h>
- #include <sys/mman.h>
-+#ifdef __ARCH_USE_MMU__
- #if defined __NR_madvise && defined __USE_BSD
- _syscall3(int, madvise, void *, __addr, size_t, __len, int, __advice)
-+#endif /* __ARCH_USE_MMU__ */
- #endif
--- 
-2.1.4
-
package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch deleted +0 -36
deleted file mode 100644
index 1d0d8a6..0000000
@@ -1,36 +0,0 @@
-From 25a60624713990c637f125e094e968ff4655307c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Wed, 7 Dec 2016 23:20:18 +0100
-Subject: [PATCH] include/sys/mman.h: remove madvise/posix_madvise
- prototypes on noMMU
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- include/sys/mman.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/sys/mman.h b/include/sys/mman.h
-index 71d553a..fc8fce5 100644
---- a/include/sys/mman.h
-+++ b/include/sys/mman.h
-@@ -99,6 +99,7 @@ static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0
- 
- #endif
- 
-+#ifdef __ARCH_USE_MMU__
- #if defined __USE_BSD && (defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__)
- /* Advise the system about particular usage patterns the program follows
-    for the region starting at ADDR and extending LEN bytes.  */
-@@ -108,6 +109,8 @@ extern int madvise (void *__addr, size_t __len, int __advice) __THROW;
- /* This is the POSIX name for this function.  */
- extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW;
- #endif
-+#endif /* __ARCH_USE_MMU__ */
-+
- 
- #if defined __UCLIBC_HAS_REALTIME__
- # ifdef __ARCH_USE_MMU__
--- 
-2.1.4
-
package/uclibc/0003-bfin-fix-a-gcc-warning.patch deleted +0 -25
deleted file mode 100644
index 2463e6c..0000000
@@ -1,25 +0,0 @@
-From 1f79f41508d0f9c30be812bea9b84fd7900a273e Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Thu, 8 Dec 2016 04:07:47 +0100
-Subject: [PATCH] bfin: fix a gcc warning
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- ldso/ldso/bfin/dl-sysdep.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h
-index 5758117..4262a26 100644
---- a/ldso/ldso/bfin/dl-sysdep.h
-+++ b/ldso/ldso/bfin/dl-sysdep.h
-@@ -93,6 +93,6 @@ static __always_inline void
- elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
- 		      Elf32_Word relative_count)
- {
--	return 0;
-+	return;
- }
- #endif
--- 
-2.1.4
-
package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch deleted +0 -49

49 lines not on this page · raw message

package/uclibc/0005-xtensa-fix-static-linking.patch deleted +0 -60

60 lines not on this page · raw message

package/uclibc/0006-threads-optimize-single-threaded-applications.patch deleted +0 -83

83 lines not on this page · raw message

package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch deleted +0 -42

42 lines not on this page · raw message

package/uclibc/uClibc-ng.config +0 -2
index 2671e06..528bce9 100644
@@ -5,8 +5,6 @@ KERNEL_HEADERS="/usr/src/linux/include"
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 LDSO_RUNPATH_OF_EXECUTABLE=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_HAS_OBSTACK=y
 UCLIBC_HAS_UTMPX=y
 UCLIBC_HAS_UTMP=y
 UCLIBC_SUSV2_LEGACY=y
package/uclibc/uclibc.hash +1 -1
index 9d2a5ec..0c9e71a 100644
@@ -1,2 +1,2 @@
 # From http://www.uclibc-ng.org/
-sha256  1c817672a65cf9132c98f84e1b8445650de1c18eca258f49c0050b420a25e946        uClibc-ng-1.0.20.tar.xz
+sha256  6e99ebebe8a46ddcd26615828d51b62dbf580568aa58bf5f495da37eba0c872d        uClibc-ng-1.0.21.tar.xz
package/uclibc/uclibc.mk +1 -1
index aa67a1e..bef1bb7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.20
+UCLIBC_VERSION = 1.0.21
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPLv2.1+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 uclibc: update to 1.0.21

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Waldemar" == Waldemar Brodkorb <[email protected]> writes:

Remove all patches as they are upstream.
Remove MALLOC_GLIBC_COMPAT and UCLIBC_HAS_OBSTACK as they got removed.

---
the patch shouldn't be applied before:
busybox: fix modutils compile

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 uclibc: update to 1.0.21

In reply to Waldemar Brodkorb

Hello,

Quoted 4 lines · Waldemar Brodkorb

Remove all patches as they are upstream.
Remove MALLOC_GLIBC_COMPAT and UCLIBC_HAS_OBSTACK as they got removed.

I believe this update breaks the libglib build. The new uclibc-ng version provides its own libiconv implementation. And interestingly, all the libglib failures of the last days occur only with the uClibc internal toolchain configurations (on powerpc, arm, xtensa and arc). And they all fail with:

gconvert.c:25:19: fatal error: iconv.h: No such file or directory

So it seems like the configure script detects that the C library provides iconv_open() and therefore assumes it provides the iconv implementation. But then later fails because there's no iconv.h.

Note: this is a very quick analysis, the problem may be more complicated. But it clearly points at the latest uClibc-ng bump.

Full list of build failures:

http://autobuild.buildroot.net/?reason=libglib2-2.50.2&step=250

It started failing at commit b575baeb, which is exactly one commit after the uclibc-ng bump to 1.0.21.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com