[oe-commits] Holger Hans Peter Freyther : util-linux-ng: Fix compile of 2.15 for uclibc

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 08e6f4644209958239e9bc745ada27a7eb2e4882
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=08e6f4644209958239e9bc745ada27a7eb2e4882

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Thu Jul  2 00:08:40 2009 +0200

util-linux-ng: Fix compile of 2.15 for uclibc

Unconditionally include stdarg.h to introduce va_list to
the compiler. uclibc has langinfo but not these kind of
attributes. Guard the usage of these attribute similar to
how the uclibc locale test program is doing it.

---

 recipes/util-linux-ng/files/uclibc-compile.patch |   25 ++++++++++++++++++++++
 recipes/util-linux-ng/util-linux-ng_2.15.bb      |    1 +
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/recipes/util-linux-ng/files/uclibc-compile.patch b/recipes/util-linux-ng/files/uclibc-compile.patch
new file mode 100644
index 0000000..def2336
--- /dev/null
+++ b/recipes/util-linux-ng/files/uclibc-compile.patch
@@ -0,0 +1,25 @@
+Index: util-linux-ng-2.15/libs/blkid/src/blkidP.h
+===================================================================
+--- util-linux-ng-2.15.orig/libs/blkid/src/blkidP.h	2009-07-01 23:09:57.000000000 +0200
++++ util-linux-ng-2.15/libs/blkid/src/blkidP.h	2009-07-01 23:10:09.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <stdarg.h>
+ 
+ #include "bitops.h"	/* $(top_srcdir)/include/ */
+ #include "blkid.h"
+Index: util-linux-ng-2.15/misc-utils/cal.c
+===================================================================
+--- util-linux-ng-2.15.orig/misc-utils/cal.c	2009-07-01 23:16:54.000000000 +0200
++++ util-linux-ng-2.15/misc-utils/cal.c	2009-07-01 23:17:08.000000000 +0200
+@@ -291,7 +291,7 @@
+  * the locale database, which can be overridden with the
+  * -s (Sunday) or -m (Monday) options.
+  */
+-#ifdef HAVE_LANGINFO_H
++#if defined(HAVE_LANGINFO_H) && !defined(__UCLIBC__)
+ 	/*
+ 	 * You need to use 2 locale variables to get the first day of the week.
+ 	 * This is needed to support first_weekday=2 and first_workday=1 for
diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb
index 1e36dd3..0c2416f 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.15.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb
@@ -4,6 +4,7 @@ PR = "${INC_PR}"
 
 SRC_URI += "file://fix-make-c.patch;patch=1 \
             file://optional-uuid.patch;patch=1 \
+            file://uclibc-compile.patch;patch=1 \
 "
 
 LDFLAGS_append = " -luuid"