Skip to contentSkip to conversation

package/sane-backends: remove unsafe headers path

PATCH New Romain Naour 3 participants 3 messages Jan 10, 2015 – Feb 1, 2015

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH v2 1/1 package/sane-backends: remove unsafe headers path

Fixes:
http://autobuild.buildroot.net/results/deb/deb3d45416633b9217d3cc09664273687c809464/

Signed-off-by Romain Naour <[email protected]>

---
v2: remove entirely "INCLUDES=" line (Thomas Petazzoni)

---
 .../0003-remove-unsafe-headers-path.patch          | 28 ++++++++++++++++++++++
 package/sane-backends/sane-backends.mk             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch
package/sane-backends/0003-remove-unsafe-headers-path.patch new file +28 -0
new file mode 100644
index 0000000..29b8d04
@@ -0,0 +1,28 @@
+From 3c03e4b81c9de73e57a56029f7f8cda8bec24e91 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 10 Jan 2015 15:48:21 +0100
+Subject: [PATCH] configure.in: remove unsafe headers path
+
+Forcing /usr/local/include headers path in CFLAGS is unsafe for
+cross-compilation.
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a8fc950..93a4b77 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+ AC_SUBST(INCLUDES)
+ SANE_SET_CFLAGS([$is_release])
+ SANE_SET_LDFLAGS
+-- 
+1.9.3
+
package/sane-backends/sane-backends.mk +2 -0
index f8c59e8..bde8e6a 100644
@@ -10,6 +10,8 @@ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 SANE_BACKENDS_LICENSE = GPLv2+
 SANE_BACKENDS_LICENSE_FILES = COPYING
 SANE_BACKENDS_INSTALL_STAGING = YES
+# 0003-remove-unsafe-headers-path.patch patch configure.in
+SANE_BACKENDS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
Signature · 1 line
1.9.3
#1 lore raw

PATCH v2 1/1 package/sane-backends: remove unsafe headers path

Romain, All,

On 2015-01-10 16:51 +0100, Romain Naour spake thusly:

Quoted 4 lines

Fixes:
http://autobuild.buildroot.net/results/deb/deb3d45416633b9217d3cc09664273687c809464/

Signed-off-by Romain Naour <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 62 lines

---
v2: remove entirely "INCLUDES=" line (Thomas Petazzoni)

---
 .../0003-remove-unsafe-headers-path.patch          | 28 ++++++++++++++++++++++
 package/sane-backends/sane-backends.mk             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch
package/sane-backends/0003-remove-unsafe-headers-path.patch new file +28 -0
new file mode 100644
index 0000000..29b8d04
@@ -0,0 +1,28 @@
+From 3c03e4b81c9de73e57a56029f7f8cda8bec24e91 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 10 Jan 2015 15:48:21 +0100
+Subject: [PATCH] configure.in: remove unsafe headers path
+
+Forcing /usr/local/include headers path in CFLAGS is unsafe for
+cross-compilation.
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a8fc950..93a4b77 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+ AC_SUBST(INCLUDES)
+ SANE_SET_CFLAGS([$is_release])
+ SANE_SET_LDFLAGS
+-- 
+1.9.3
+
package/sane-backends/sane-backends.mk +2 -0
index f8c59e8..bde8e6a 100644
@@ -10,6 +10,8 @@ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 SANE_BACKENDS_LICENSE = GPLv2+
 SANE_BACKENDS_LICENSE_FILES = COPYING
 SANE_BACKENDS_INSTALL_STAGING = YES
+# 0003-remove-unsafe-headers-path.patch patch configure.in
+SANE_BACKENDS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
Signature · 6 lines
1.9.3

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH v2 1/1 package/sane-backends: remove unsafe headers path

In reply to Romain Naour

Dear Romain Naour,

Quoted 11 lines · Romain Naour

Fixes:
http://autobuild.buildroot.net/results/deb/deb3d45416633b9217d3cc09664273687c809464/

Signed-off-by Romain Naour <[email protected]>

---
v2: remove entirely "INCLUDES=" line (Thomas Petazzoni)

---
 .../0003-remove-unsafe-headers-path.patch          | 28 ++++++++++++++++++++++
 package/sane-backends/sane-backends.mk             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com