Skip to contentSkip to conversation

package/sane-backends: rename patches to the new naming convention

PATCH New Romain Naour 2 participants 4 messages Jan 10, 2015

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/2 package/sane-backends: rename patches to the new naming convention

Signed-off-by Romain Naour <[email protected]>
---
 .../{sane-backends-1.0.22-qcam-x86.patch => 0001-qcam-x86.patch}          | 0
 package/sane-backends/{sane-backends-1.0.22-v4l.patch => 0002-v4l.patch}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/sane-backends/{sane-backends-1.0.22-qcam-x86.patch => 0001-qcam-x86.patch} (100%)
 rename package/sane-backends/{sane-backends-1.0.22-v4l.patch => 0002-v4l.patch} (100%)
package/sane-backends/0001-qcam-x86.patch renamed from package/sane-backends/sane-backends-1.0.22-qcam-x86.patch +0 -0
similarity index 100%
rename from package/sane-backends/sane-backends-1.0.22-qcam-x86.patch
rename to package/sane-backends/0001-qcam-x86.patch
package/sane-backends/0002-v4l.patch renamed from package/sane-backends/sane-backends-1.0.22-v4l.patch +0 -0
similarity index 100%
rename from package/sane-backends/sane-backends-1.0.22-v4l.patch
rename to package/sane-backends/0002-v4l.patch
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 2/2 package/sane-backends: remove unsafe headers path

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

Signed-off-by Romain Naour <[email protected]>
---
 .../0003-remove-unsafe-headers-path.patch          | 29 ++++++++++++++++++++++
 package/sane-backends/sane-backends.mk             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch
package/sane-backends/0003-remove-unsafe-headers-path.patch new file +29 -0
new file mode 100644
index 0000000..54b1835
@@ -0,0 +1,29 @@
+From a79d700923134678c38cedd96fa00b058f70d597 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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a8fc950..0b0bcd1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
++INCLUDES="${INCLUDES}"
+ 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
#2 lore raw

PATCH 2/2 package/sane-backends: remove unsafe headers path

Dear Romain Naour,

package/sane-backends/0003-remove-unsafe-headers-path.patch line 23

Quoted 10 lines · Romain Naour
package/sane-backends/0003-remove-unsafe-headers-path.patch new file +10 -0
+diff --git a/configure.in b/configure.in
+index a8fc950..0b0bcd1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
++INCLUDES="${INCLUDES}"

Hum, INCLUDES="${INCLUDES}" could also be replaced with just nothing, no? So shouldn't your patch simply get rid of this line?

Also, please submit upstream, thanks :)

Thomas

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