[flashrom] [commit] r968 - trunk

[repository service]

Author: hailfinger
Date: Mon Mar 22 13:29:45 2010
New Revision: 968
URL: http://flashrom.org/trac/coreboot/changeset/968

Log:
Idwer Vollering reported problems with the current libpci check on
FreeBSD 8.0-RELEASE i386
This is caused by a strict linker. Parsing linker error messages is an
exercise in futility, and library detection with
$CC --print-file-name
is totally useless for libraries outside the standard hardcoded builtin
gcc search path (probably the same for other compilers as well).

Look for libpciutils instead of libpci on NetBSD during the check.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Idwer Vollering <vidwer at gmail.com>

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Mar 22 08:03:26 2010	(r967)
+++ trunk/Makefile	Mon Mar 22 13:29:45 2010	(r968)
@@ -279,26 +279,17 @@
 		echo "Please install libpci headers (package pciutils-devel).";	\
 		echo "See README for more information."; echo;			\
 		rm -f .test.c .test.o; exit 1)
-	@printf "Checking for libpci... "
-	@$(shell ( echo "#include <pci/pci.h>";		   \
-		   echo "int main(int argc, char **argv)"; \
-		   echo "{ return 0; }"; ) > .test1.c )
-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test1.c -o .test1 -lpci $(LIBS) >/dev/null 2>&1 &&	\
-		echo "found." || ( echo "not found."; echo;				\
-		echo "Please install libpci (package pciutils).";			\
-		echo "See README for more information."; echo;				\
-		rm -f .test1.c .test1; exit 1)
-	@printf "Checking if libpci is sufficient... "
+	@printf "Checking if libpci is present and sufficient... "
 	@printf "" > .libdeps
-	@$(CC) $(LDFLAGS) .test.o -o .test -lpci $(LIBS) >/dev/null 2>&1 &&				\
+	@$(CC) $(LDFLAGS) .test.o -o .test $(LIBS) >/dev/null 2>&1 &&				\
 		echo "yes." || ( echo "no.";							\
-		printf "Checking if libz is present and supplies all needed symbols...";	\
-		$(CC) $(LDFLAGS) .test.o -o .test -lpci -lz $(LIBS) >/dev/null 2>&1 &&		\
+		printf "Checking if libz+libpci are present and sufficient...";	\
+		$(CC) $(LDFLAGS) .test.o -o .test $(LIBS) -lz >/dev/null 2>&1 &&		\
 		( echo "yes."; echo "NEEDLIBZ := yes" > .libdeps ) || ( echo "no."; echo;	\
-		echo "Please install libz.";			\
+		echo "Please install libpci (package pciutils) and/or libz.";			\
 		echo "See README for more information."; echo;				\
 		rm -f .test.c .test.o .test; exit 1) )
-	@rm -f .test.c .test.o .test .test1.c .test1
+	@rm -f .test.c .test.o .test
 else
 pciutils: compiler
 	@printf "" > .libdeps