neard: fix build with kernel headers 3.1 - 3.6
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
neard uses the linux/nfc.h header which is fairly recent, so we have a patch that creates linux-nfc.h and uses it if necessary. However, since the bump to 0.9, neard uses some symbols that are introduced in linux 3.7 so the build fails with headers 3.1 (which introduced nfc.h) to 3.6.
To resolve that, add a check for one of the newly introduced symbols (that is used by neard).
---
Probably wanted for 2013.02.
I selected the symbol to check for with 'git log -p v3.7 include/linux/nfc.h' in the kernel.
--- package/neard/neard-fix-missing-linux-nfc-header.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
package/neard/neard-fix-missing-linux-nfc-header.patch +8 -2
@@ -8,17 +8,23 @@ As a workaround until all reasonable toolchains get this header included, add a configure check in neard to test whether this header is available or not, and if not, use our own private copy of it. +Since symbols from the v3.7 kernel header are used, but linux/nfc.h +already exists since the v3.1 kernel, check for one of the most +recently added symbols: NFC_LLCP_RAW_HEADER_SIZE. + Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -88,6 +88,8 @@ +@@ -88,6 +88,9 @@ AC_SUBST(NETLINK_CFLAGS) AC_SUBST(NETLINK_LIBS) -+AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>]) ++AC_TRY_COMPILE([#include <linux/nfc.h>], [int err[[NFC_LLCP_RAW_HEADER_SIZE-2]];], ++ [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], []) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]),
Signature · 1 line
1.7.10.4
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
neard uses the linux/nfc.h header which is fairly recent, so we have a patch that creates linux-nfc.h and uses it if necessary. However, since the bump to 0.9, neard uses some symbols that are introduced in linux 3.7 so the build fails with headers 3.1 (which introduced nfc.h) to 3.6.
To resolve that, add a check for one of the newly introduced symbols (that is used by neard).
---
v2: Forgot to include <sys/socket.h>.
Probably wanted for 2013.02.
I selected the symbol to check for with 'git log -p v3.7 include/linux/nfc.h' in the kernel.
--- package/neard/neard-fix-missing-linux-nfc-header.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
package/neard/neard-fix-missing-linux-nfc-header.patch +11 -2
@@ -8,17 +8,26 @@ As a workaround until all reasonable toolchains get this header included, add a configure check in neard to test whether this header is available or not, and if not, use our own private copy of it. +Since symbols from the v3.7 kernel header are used, but linux/nfc.h +already exists since the v3.1 kernel, check for one of the most +recently added symbols: NFC_LLCP_RAW_HEADER_SIZE. + Signed-off-by: Thomas Petazzoni <[email protected]> +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -88,6 +88,8 @@ +@@ -88,6 +88,12 @@ AC_SUBST(NETLINK_CFLAGS) AC_SUBST(NETLINK_LIBS) -+AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>]) ++AC_TRY_COMPILE([ ++#include <sys/socket.h> ++#include <linux/nfc.h> ++ ], [int err[NFC_LLCP_RAW_HEADER_SIZE-2];], ++ [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], []) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]),
Signature · 1 line
1.7.10.4
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> Arnout> neard uses the linux/nfc.h header which is fairly recent, so we have a Arnout> patch that creates linux-nfc.h and uses it if necessary. However, since Arnout> the bump to 0.9, neard uses some symbols that are introduced in linux 3.7 Arnout> so the build fails with headers 3.1 (which introduced nfc.h) to 3.6.
Arnout> To resolve that, add a check for one of the newly introduced symbols Arnout> (that is used by neard).
Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> Arnout> ---
Arnout> v2: Forgot to include <sys/socket.h>.
Arnout> Probably wanted for 2013.02.
Committed, thanks. Don't forget to send upstream.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
Quoted 11 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> Arnout> neard uses the
linux/nfc.hheader which is fairly recent, so we have a Arnout> patch that createslinux-nfc.hand uses it if necessary. However, since Arnout> the bump to 0.9, neard uses some symbols that are introduced in linux 3.7 Arnout> so the build fails with headers 3.1 (which introducednfc.h) to 3.6.Arnout> To resolve that, add a check for one of the newly introduced symbols Arnout> (that is used by neard).
Quoted 7 lines
Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> Arnout> ---
Arnout> v2: Forgot to include <sys/socket.h>.Arnout> Probably wanted for 2013.02.
Committed, thanks. Don't forget to send upstream.
Thomas, did you ever send the original patch upstream?
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
Dear Arnout Vandecappelle,
Quoted 3 lines · Arnout Vandecappelle
Quoted 1 line
Committed, thanks. Don't forget to send upstream.
Thomas, did you ever send the original patch upstream?
No, I did not. Since the patch carries an entire copy of the kernel header, I am fairly sure that upstream will not be very interested.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 neard: fix build with kernel headers 3.1 - 3.6
Quoted 10 lines · Thomas Petazzoni
Dear Arnout Vandecappelle,
Quoted 3 lines · Arnout Vandecappelle
Quoted 1 line
Committed, thanks. Don't forget to send upstream.
Thomas, did you ever send the original patch upstream?
No, I did not. Since the patch carries an entire copy of the kernel header, I am fairly sure that upstream will not be very interested.
In that case I won't upstream my patch either :-)
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F