aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Mednyy <swexru@gmail.com>2015-03-09 14:37:47 +0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-09 14:04:52 +0100
commit2676d7f80d2e5eb8bb8c605b215bfe4e9bfaf097 (patch)
treec98becee374c3f9a520f4896dfa7ff3b06680d8c
parentcadeb9c2503620c24a3bfba55f2048f3b33f71d9 (diff)
downloadbuildroot-2676d7f80d2e5eb8bb8c605b215bfe4e9bfaf097.tar.gz
buildroot-2676d7f80d2e5eb8bb8c605b215bfe4e9bfaf097.tar.bz2
eudev: fix dependency on kernel headers version
[Thomas: - indicate upstream commit id, as suggested by Baruch. - add SoB of Alexey inside the patch itself. - adjust sequence number to 0003.] Signed-off-by: Alexey Mednyy <swexru@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/eudev/0003-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch41
-rw-r--r--package/eudev/eudev.mk2
-rw-r--r--system/Config.in6
3 files changed, 45 insertions, 4 deletions
diff --git a/package/eudev/0003-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch b/package/eudev/0003-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch
new file mode 100644
index 0000000000..305ec4353a
--- /dev/null
+++ b/package/eudev/0003-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch
@@ -0,0 +1,41 @@
+From 6740579367ddd2ce0b315863cdb92d34d1d693c7 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sun, 16 Nov 2014 13:40:43 -0500
+Subject: [PATCH] configure.ac: don't die on missing linux/btrfs.h, fixes issue
+ #100
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+Taken from upstream commit 6740579367d.
+
+Signed-off-by: Alexey Mednyy <swexru@gmail.com>
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a3747f9..dbca833 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,11 +49,17 @@ AC_CHECK_HEADERS(
+ )
+
+ AC_CHECK_HEADERS(
+- [linux/btrfs.h mtd/mtd-user.h],
++ [mtd/mtd-user.h],
+ [],
+ [AC_MSG_ERROR([*** KERNEL header not found])]
+ )
+
++AC_CHECK_HEADERS(
++ [linux/btrfs.h],
++ [],
++ [AC_MSG_WARN([*** KERNEL header not found])]
++)
++
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_UID_T
+ AC_C_INLINE
+--
+1.9.1
+
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
index 2221966d51..f5159a2d8d 100644
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -10,6 +10,8 @@ EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
EUDEV_LICENSE_FILES = COPYING
EUDEV_INSTALL_STAGING = YES
+# We're patching configure.ac
+EUDEV_AUTORECONF = YES
# mq_getattr is in librt
EUDEV_CONF_ENV += LIBS=-lrt
diff --git a/system/Config.in b/system/Config.in
index 4d1c3d2faf..9973cc2d6a 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -128,13 +128,11 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU # eudev
- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
select BR2_PACKAGE_EUDEV
-comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >= 3.9"
+comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
- || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+ depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
endchoice