Skip to contentSkip to conversation

eudev: Drop patch eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13

PATCH New Peter Meerwald 2 participants 3 messages Apr 5, 2014 – Apr 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eudev: Drop patch eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13

added by commit 221fd0cd, which basically removes #include <fcntl.h> from a couple of files; it leads to

CC accelerometer.o
accelerometer.c: In function ?test_orientation?:
accelerometer.c:203:9: warning: implicit declaration of function ?open? [-Wimplicit-function-declaration]

         fd = open(devpath, O_RDONLY|O_CLOEXEC);
         ^
accelerometer.c:203:28: error: ?O_RDONLY? undeclared (first use in this function)
         fd = open(devpath, O_RDONLY|O_CLOEXEC);
                            ^

accelerometer.c:203:37: error: ?O_CLOEXEC? undeclared (first use in this function)

the prototype for open() is supposed to be in fnctl.h, hence the #include is needed

Cc Eric Le Bihan <[email protected]>
Cc Peter Korsgaard <[email protected]>
---
 ...e-87-fails-to-build-on-linux-headers-3.13.patch | 85 ----------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 package/eudev/eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13.patch
package/eudev/eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13.patch deleted +0 -85
deleted file mode 100644
index 80f7aa8..0000000
@@ -1,85 +0,0 @@
-From c5a77c7d10bafac25deca8e3c36946df0dc43071 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <[email protected]>
-Date: Sat, 15 Mar 2014 08:16:41 -0400
-Subject: [PATCH] Fix issue #87: fails to build on linux headers 3.13
-
-Commit 80b10107cb added #include <linux/fcntl.h> in
-src/accelerometer and friends for builds on uclibc.
-This only works with glibc and musl systems with
-linux headers 3.9 but fails with linux headers 3.13.
-
-We keep <linux/fcntl.h> but drop <fcntl.h>.
-
-Signed-off-by: Eric Le Bihan <[email protected]>
-Signed-off-by: Anthony G. Basile <[email protected]>
----
- src/accelerometer/accelerometer.c |    1 -
- src/ata_id/ata_id.c               |    1 -
- src/collect/collect.c             |    1 -
- src/mtd_probe/mtd_probe.c         |    1 -
- src/scsi_id/scsi_serial.c         |    1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/src/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
-index f65631a..386775b 100644
---- a/src/accelerometer/accelerometer.c
-+++ b/src/accelerometer/accelerometer.c
-@@ -50,7 +50,6 @@
- #include <math.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <getopt.h>
-diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c
-index a25c713..500669c 100644
---- a/src/ata_id/ata_id.c
-+++ b/src/ata_id/ata_id.c
-@@ -23,7 +23,6 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <unistd.h>
--#include <fcntl.h>
- #include <ctype.h>
- #include <string.h>
- #include <errno.h>
-diff --git a/src/collect/collect.c b/src/collect/collect.c
-index fbaf87f..7fefc62 100644
---- a/src/collect/collect.c
-+++ b/src/collect/collect.c
-@@ -24,7 +24,6 @@
- #include <stddef.h>
- #include <unistd.h>
- #include <signal.h>
--#include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <getopt.h>
-diff --git a/src/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
-index e604a72..bab2e8e 100644
---- a/src/mtd_probe/mtd_probe.c
-+++ b/src/mtd_probe/mtd_probe.c
-@@ -22,7 +22,6 @@
- #include <mtd/mtd-user.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <fcntl.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <linux/fcntl.h>
-diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
-index b60b154..7c5f7a3 100644
---- a/src/scsi_id/scsi_serial.c
-+++ b/src/scsi_id/scsi_serial.c
-@@ -23,7 +23,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <syslog.h>
---
-1.7.9.5
-
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 eudev: Drop patch eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13

Peter, All,

On 2014-04-05 15:38 +0200, Peter Meerwald spake thusly:

Quoted 12 lines

added by commit 221fd0cd, which basically removes #include <fcntl.h> from a couple of files; it leads to

CC accelerometer.o
accelerometer.c: In function ?test_orientation?:
accelerometer.c:203:9: warning: implicit declaration of function ?open? [-Wimplicit-function-declaration]

         fd = open(devpath, O_RDONLY|O_CLOEXEC);
         ^
accelerometer.c:203:28: error: ?O_RDONLY? undeclared (first use in this function)
         fd = open(devpath, O_RDONLY|O_CLOEXEC);
                            ^
Quoted 5 lines

accelerometer.c:203:37: error: ?O_CLOEXEC? undeclared (first use in this function)

the prototype for open() is supposed to be in fnctl.h, hence the #include is needed

I can confirm this fixes the issue whith my glibc-based toolchain, for an ARM platform.

I'll build up a uClibc-based system shortly to see if it is also working on uClibc. Until then, I'm not adding an official tested-by tag.

Regards,
Yann E. MORIN.

Quoted 106 lines
Cc Eric Le Bihan <[email protected]>
Cc Peter Korsgaard <[email protected]>
---
 ...e-87-fails-to-build-on-linux-headers-3.13.patch | 85 ----------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 package/eudev/eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13.patch
package/eudev/eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13.patch deleted +0 -85
deleted file mode 100644
index 80f7aa8..0000000
@@ -1,85 +0,0 @@
-From c5a77c7d10bafac25deca8e3c36946df0dc43071 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <[email protected]>
-Date: Sat, 15 Mar 2014 08:16:41 -0400
-Subject: [PATCH] Fix issue #87: fails to build on linux headers 3.13
-
-Commit 80b10107cb added #include <linux/fcntl.h> in
-src/accelerometer and friends for builds on uclibc.
-This only works with glibc and musl systems with
-linux headers 3.9 but fails with linux headers 3.13.
-
-We keep <linux/fcntl.h> but drop <fcntl.h>.
-
-Signed-off-by: Eric Le Bihan <[email protected]>
-Signed-off-by: Anthony G. Basile <[email protected]>
----
- src/accelerometer/accelerometer.c |    1 -
- src/ata_id/ata_id.c               |    1 -
- src/collect/collect.c             |    1 -
- src/mtd_probe/mtd_probe.c         |    1 -
- src/scsi_id/scsi_serial.c         |    1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/src/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
-index f65631a..386775b 100644
---- a/src/accelerometer/accelerometer.c
-+++ b/src/accelerometer/accelerometer.c
-@@ -50,7 +50,6 @@
- #include <math.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <getopt.h>
-diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c
-index a25c713..500669c 100644
---- a/src/ata_id/ata_id.c
-+++ b/src/ata_id/ata_id.c
-@@ -23,7 +23,6 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <unistd.h>
--#include <fcntl.h>
- #include <ctype.h>
- #include <string.h>
- #include <errno.h>
-diff --git a/src/collect/collect.c b/src/collect/collect.c
-index fbaf87f..7fefc62 100644
---- a/src/collect/collect.c
-+++ b/src/collect/collect.c
-@@ -24,7 +24,6 @@
- #include <stddef.h>
- #include <unistd.h>
- #include <signal.h>
--#include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <getopt.h>
-diff --git a/src/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
-index e604a72..bab2e8e 100644
---- a/src/mtd_probe/mtd_probe.c
-+++ b/src/mtd_probe/mtd_probe.c
-@@ -22,7 +22,6 @@
- #include <mtd/mtd-user.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <fcntl.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <linux/fcntl.h>
-diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
-index b60b154..7c5f7a3 100644
---- a/src/scsi_id/scsi_serial.c
-+++ b/src/scsi_id/scsi_serial.c
-@@ -23,7 +23,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <syslog.h>
---
-1.7.9.5
-
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 eudev: Drop patch eudev-0001-Fix-issue-87-fails-to-build-on-linux-headers-3.13

Peter, All,

On 2014-04-06 14:15 +0200, Yann E. MORIN spake thusly:

Quoted 16 lines

On 2014-04-05 15:38 +0200, Peter Meerwald spake thusly:

Quoted 15 lines

added by commit 221fd0cd, which basically removes #include <fcntl.h> from a couple of files; it leads to

CC accelerometer.o
accelerometer.c: In function ?test_orientation?:
accelerometer.c:203:9: warning: implicit declaration of function ?open? [-Wimplicit-function-declaration]

         fd = open(devpath, O_RDONLY|O_CLOEXEC);
         ^
accelerometer.c:203:28: error: ?O_RDONLY? undeclared (first use in this function)
         fd = open(devpath, O_RDONLY|O_CLOEXEC);
                            ^

accelerometer.c:203:37: error: ?O_CLOEXEC? undeclared (first use in this function)

Quoted 5 lines
Quoted 2 lines

the prototype for open() is supposed to be in fnctl.h, hence the #include is needed

I can confirm this fixes the issue whith my glibc-based toolchain, for an ARM platform.

Seems we are not the only ones to struggle with this. Upstream has had so far three tentatives to fix this issue:

    [1] https://github.com/gentoo/eudev/commit/c5a77c7d10bafac25deca8e3c36946df0dc43071
    [2] https://github.com/gentoo/eudev/commit/974354dee5f5abdea22958c3d57f41d9425f1a8c
    [3] https://github.com/gentoo/eudev/commit/4b76ac0bff27c0a32fc22591ec4543768ae5b991

Patch [1] is the one we currently bundle. I'll do some testing here, and will spin a patch later.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'