util-linux: fix scanf fallback detection for uClibc-ng

uClibc-ng pretends to be GNU libc 2.2 and then a fallback
scanf check is tried, so that libmount is disabled
afterwards. Add a fix already suggested upstream.
Add librt dependency required for other apps, too.

Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
This commit is contained in:
Waldemar Brodkorb 2016-06-04 22:24:56 +02:00 committed by John Crispin
parent 8ee30ade17
commit 5d8ece87a4
2 changed files with 35 additions and 1 deletions

View File

@ -40,6 +40,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/util-linux/Default
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:= +librt
URL:=http://www.kernel.org/pub/linux/utils/util-linux/
endef
@ -167,7 +168,6 @@ endef
define Package/dmesg
$(call Package/util-linux/Default)
TITLE:=print or control the kernel ring buffer
DEPENDS:= +librt
endef
define Package/dmesg/description

View File

@ -0,0 +1,34 @@
From 180c908e2e80552b19bf3552667fc197d6edf7b3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 3 Jun 2016 04:13:08 +0200
Subject: [PATCH] fix uClibc-ng scanf check
uClibc-ng tries to be compatible with GNU libc and defines
__GLIBC__ and pretend to be version 2.2.
We once changed it to 2.10, but then some hard to fix problems
in different software packages (gcc) occured.
It would be better if we disable the special GNU libc checks
for uClibc-ng here. uClibc-ng implements the required scanf
functionality.
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f36b18c..4661c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,7 +581,7 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier],
#include <stdio.h>
#include <unistd.h>
- #ifdef __GLIBC__
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
#if !(__GLIBC_PREREQ(2, 7))
#error %m is not available
--
2.1.4