sdparm: remove include of host headers
authorBaruch Siach <baruch@tkos.co.il>
Fri, 6 Feb 2015 07:45:14 +0000 (09:45 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 6 Feb 2015 09:36:34 +0000 (10:36 +0100)
Fixes:
http://autobuild.buildroot.net/results/458/458b3da912b977335ac292fa7adddfb85961557a/
http://autobuild.buildroot.net/results/ead/ead9c1d354e9beebdcb892ded2d63b8d3bc3eb51/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/sdparm/0000-makefile-remove-host-headers-include.patch [new file with mode: 0644]
package/sdparm/sdparm.mk

diff --git a/package/sdparm/0000-makefile-remove-host-headers-include.patch b/package/sdparm/0000-makefile-remove-host-headers-include.patch
new file mode 100644 (file)
index 0000000..765a81d
--- /dev/null
@@ -0,0 +1,19 @@
+src/Makefile.am: remove host headers incdlue
+
+Using host headers is bad for cross compilation. Instead, use the '=' prefix
+which expands to the current sysroot.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+diff -Nuar sdparm-1.09-orig/src/Makefile.am sdparm-1.09/src/Makefile.am
+--- sdparm-1.09-orig/src/Makefile.am   2014-09-23 18:48:44.000000000 +0300
++++ sdparm-1.09/src/Makefile.am        2015-02-06 09:33:43.693477667 +0200
+@@ -41,7 +41,7 @@
+                       ../lib/sg_pt_common.c
+ if HAVE_SGUTILS
+-INCLUDES = -I/usr/include/scsi
++INCLUDES = -I=/scsi
+ sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
+ sdparm_DEPENDENCIES = @GETOPT_O_FILES@
+ else
index 4aff25db264cfe4a013da1195d838a95ede6631b..9fc20674d09f7001a8ab19a6e35145192d4b1023 100644 (file)
@@ -10,6 +10,9 @@ SDPARM_SITE = http://sg.danny.cz/sg/p
 SDPARM_LICENSE = BSD-3c
 SDPARM_LICENSE_FILES = COPYING
 
+# Patching src/Makefile.am
+SDPARM_AUTORECONF = YES
+
 ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
 SDPARM_DEPENDENCIES += sg3_utils
 else