[coreboot] New patch to review for coreboot: 293fa38 inteltool: fix Makefile

Stefan Tauner (stefan.tauner@gmx.at) gerrit at coreboot.org
Sat Oct 13 02:41:23 CEST 2012


Stefan Tauner (stefan.tauner at gmx.at) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1575

-gerrit

commit 293fa38f467b4f8fe4a51857e141bd3b1719c8b1
Author: Stefan Tauner <stefan.tauner at gmx.at>
Date:   Fri Oct 12 10:36:49 2012 +0200

    inteltool: fix Makefile
    
    Use the verbatim variable method to define and export test code and
    the actual libpci test from flashrom. This improves readability and
    will work with stricter compiler (settings).
    
    Change-Id: Iace7d53b0b992c4fde596ce1d606ad715d6dfc2a
    Signed-off-by: Stefan Tauner <stefan.tauner at gmx.at>
---
 util/inteltool/Makefile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index af79b1e..6c94460 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -53,12 +53,24 @@ distclean: clean
 dep:
 	@$(CC) $(CFLAGS) -MM *.c > .dependencies
 
+define LIBPCI_TEST
+/* Avoid a failing test due to libpci header symbol shadowing breakage */
+#define index shadow_workaround_index
+#include <pci/pci.h>
+struct pci_access *pacc;
+int main(int argc, char **argv)
+{
+	(void) argc;
+	(void) argv;
+	pacc = pci_alloc();
+	return 0;
+}
+endef
+export LIBPCI_TEST
+
 pciutils:
 	@printf "\nChecking for pciutils and zlib... "
-	@$(shell ( printf "#include <pci/pci.h>\n";		\
-		   printf "struct pci_access *pacc;\n";		\
-		   printf "int main(int argc, char **argv)\n";	\
-		   printf "{ pacc = pci_alloc(); return 0; }\n"; ) > .test.c )
+	@echo "$$LIBPCI_TEST" > .test.c
 	@$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 &&	  \
 		printf "found.\n" || ( printf "not found.\n\n"; 	  \
 		printf "Please install pciutils-devel and zlib-devel.\n"; \




More information about the coreboot mailing list