[oe-commits] Koen Kooi : util-linux-ng 2.15: stage libblkid (yes, this used to be in e2fsprogs(-libs))

[GIT User account]

Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: 3d1136959ad0b77bdb37a418f17925bd5b8bcd05
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3d1136959ad0b77bdb37a418f17925bd5b8bcd05

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon May 18 13:01:00 2009 +0200

util-linux-ng 2.15: stage libblkid (yes, this used to be in e2fsprogs(-libs))

---

 recipes/util-linux-ng/files/fix-make-c.patch    |   41 +++++++++++++++++
 recipes/util-linux-ng/files/optional-uuid.patch |   55 +++++++++++++++++++++++
 recipes/util-linux-ng/util-linux-ng.inc         |    2 +-
 recipes/util-linux-ng/util-linux-ng_2.15.bb     |   12 +++++-
 4 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/recipes/util-linux-ng/files/fix-make-c.patch b/recipes/util-linux-ng/files/fix-make-c.patch
new file mode 100644
index 0000000..bf1082e
--- /dev/null
+++ b/recipes/util-linux-ng/files/fix-make-c.patch
@@ -0,0 +1,41 @@
+From: Karel Zak <kzak at redhat.com>
+Date: Mon, 11 May 2009 09:49:00 +0000 (+0200)
+Subject: build-sys: fix "make -C" bug
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d
+
+build-sys: fix "make -C" bug
+
+Running:
+
+./configure --with-fsprobe=builtin
+make -C mount mount
+
+causes the following error:
+
+gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I..  -include ../config.h
+-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\"
+-fsigned-char -I../libs/blkid/src   -g -O2 -MT mount-setproctitle.o
+-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o
+`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv
+-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po
+make -C
+make: option requires an argument -- 'C'
+Usage: make [options] [target] ...
+...
+
+Reported-by: Matthew Burgess <matthew at linuxfromscratch.org>
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+
+diff --git a/config/include-Makefile.am b/config/include-Makefile.am
+index b42a0c3..d5da619 100644
+--- a/config/include-Makefile.am
++++ b/config/include-Makefile.am
+@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS)
+ # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
+ #
+ ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
++ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
+ ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
+ 
+ $(ul_libblkid_la):
diff --git a/recipes/util-linux-ng/files/optional-uuid.patch b/recipes/util-linux-ng/files/optional-uuid.patch
new file mode 100644
index 0000000..2d0ea43
--- /dev/null
+++ b/recipes/util-linux-ng/files/optional-uuid.patch
@@ -0,0 +1,55 @@
+From: Karel Zak <kzak at redhat.com>
+Date: Tue, 12 May 2009 19:22:19 +0000 (+0200)
+Subject: blkid: make libuuid optional
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed
+
+blkid: make libuuid optional
+
+read.c:28:23: error: uuid/uuid.h: No such file or directory
+make[3]: *** [read.lo] Error 1
+make[3]: *** Waiting for unfinished jobs....
+
+Reported-by: Olaf <mailinglists at ban-solms.de>
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+
+diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
+index 2e59218..9091736 100644
+--- a/libs/blkid/src/config.c
++++ b/libs/blkid/src/config.c
+@@ -24,9 +24,6 @@
+ #include <errno.h>
+ #endif
+ #include <stdint.h>
+-#ifdef HAVE_LIBUUID
+-#include <uuid/uuid.h>
+-#endif
+ #include <stdarg.h>
+ 
+ #include "blkdev.h"
+diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
+index a9c9fba..f0ae126 100644
+--- a/libs/blkid/src/evaluate.c
++++ b/libs/blkid/src/evaluate.c
+@@ -27,9 +27,6 @@
+ #include <errno.h>
+ #endif
+ #include <stdint.h>
+-#ifdef HAVE_LIBUUID
+-#include <uuid/uuid.h>
+-#endif
+ #include <stdarg.h>
+ 
+ #include "pathnames.h"
+diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
+index 4163874..b5e9cd0 100644
+--- a/libs/blkid/src/read.c
++++ b/libs/blkid/src/read.c
+@@ -25,7 +25,6 @@
+ #endif
+ 
+ #include "blkidP.h"
+-#include "uuid/uuid.h"
+ 
+ #ifdef HAVE_STRTOULL
+ #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 01e769e..b49a0b2 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl"
 
-inherit autotools
+inherit autotools_stage
 
 DEFAULT_PREFERENCE = "-1"
 
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 d8cb0a7..2486e40 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.15.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb
@@ -1,6 +1,16 @@
 require util-linux-ng.inc
 
+PR = "r1"
+
+SRC_URI += "file://fix-make-c.patch;patch=1 \
+            file://optional-uuid.patch;patch=1 \
+"
+
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-LDFLAGS_append_libc-uclibc = " -lintl"
+LDFLAGS_append = " -luuid"
+LDFLAGS_append_libc-uclibc = " -luuid -lintl"
 
+do_compile_prepend() {
+	sed -i /am__append_1/d ${S}/libs/blkid/src/Makefile
+}