util-linux: Fix compile of libblkid (from patches from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
99f66c163d
commit
d6cfaee455
|
@ -0,0 +1,41 @@
|
|||
From: Karel Zak <kzak@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@linuxfromscratch.org>
|
||||
Signed-off-by: Karel Zak <kzak@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):
|
|
@ -0,0 +1,55 @@
|
|||
From: Karel Zak <kzak@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@ban-solms.de>
|
||||
Signed-off-by: Karel Zak <kzak@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 */
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
Index: util-linux-ng-2.15/libs/blkid/src/Makefile.am
|
||||
===================================================================
|
||||
--- util-linux-ng-2.15.orig/libs/blkid/src/Makefile.am 2009-05-19 17:01:15.000000000 +0100
|
||||
+++ util-linux-ng-2.15/libs/blkid/src/Makefile.am 2009-05-19 17:08:11.000000000 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
common_ldadd =
|
||||
|
||||
if HAVE_UUID
|
||||
-common_ldadd += -luuid #TODO $(UUID_LIBS)
|
||||
+common_ldadd += -luuid
|
||||
endif
|
||||
|
||||
# includes
|
||||
@@ -26,7 +26,7 @@
|
||||
$(top_srcdir)/lib/md5.c
|
||||
|
||||
libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
|
||||
-libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
|
||||
+libblkid_la_DEPENDENCIES = probers/libblkid_probers.la blkid.sym
|
||||
|
||||
# TODO: for unknown reason "make distcheck" requires
|
||||
# full path to the version script
|
|
@ -11,6 +11,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng
|
|||
file://swapargs.h \
|
||||
file://fdiskbsdlabel_thumb.diff;patch=1 \
|
||||
file://umount.diff;patch=1 \
|
||||
file://fix-make-c.patch;patch=1 \
|
||||
file://optional-uuid.patch;patch=1 \
|
||||
file://uuid.patch;patch=1 \
|
||||
file://defines.h"
|
||||
# file://gcc34.patch;patch=1 \
|
||||
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
require util-linux.inc
|
||||
|
||||
SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
|
||||
#SRC_URI += "file://glibc-fix.patch;patch=1"
|
||||
#SRC_URI += "file://debian-bug392236.patch;patch=1"
|
||||
|
||||
PR = "r11"
|
||||
PR = "r15"
|
||||
|
|
Loading…
Reference in New Issue