From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WTpMG-0002st-Sq for ptxdist@pengutronix.de; Sat, 29 Mar 2014 10:15:20 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1WTpMG-0006LN-RH for ptxdist@pengutronix.de; Sat, 29 Mar 2014 10:15:20 +0100 Date: Sat, 29 Mar 2014 10:15:20 +0100 From: Michael Olbrich Message-ID: <20140329091520.GB10959@pengutronix.de> References: <1395904307-20841-1-git-send-email-alexander.stein@systec-electronic.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1395904307-20841-1-git-send-email-alexander.stein@systec-electronic.com> Subject: Re: [ptxdist] [PATCH] host-u-boot-tools: Add patch to use project includes prior to system ones Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Thu, Mar 27, 2014 at 08:11:47AM +0100, Alexander Stein wrote: > In case lensfun is installed on the system gcc will pick the wrong header > when host-u-boot-tools are build. Thanks, applied. I hope this won't cause any other problems, because it looks like u-boot is using the search order to pick the right header files... Michael > > Signed-off-by: Alexander Stein > --- > ...r-u-boot-includes-to-system-include-direc.patch | 27 ++++++++++++++++++++++ > patches/u-boot-2011.12/series | 4 ++++ > 2 files changed, 31 insertions(+) > create mode 100644 patches/u-boot-2011.12/0001-tools-Prefer-u-boot-includes-to-system-include-direc.patch > create mode 100644 patches/u-boot-2011.12/series > > diff --git a/patches/u-boot-2011.12/0001-tools-Prefer-u-boot-includes-to-system-include-direc.patch b/patches/u-boot-2011.12/0001-tools-Prefer-u-boot-includes-to-system-include-direc.patch > new file mode 100644 > index 0000000..39f2ba9 > --- /dev/null > +++ b/patches/u-boot-2011.12/0001-tools-Prefer-u-boot-includes-to-system-include-direc.patch > @@ -0,0 +1,27 @@ > +From: Alexander Stein > +Date: Wed, 26 Mar 2014 22:46:22 +0100 > +Subject: [PATCH] tools: Prefer u-boot includes to system include directory > + > +This fixes the following build error when lensfun is installed: > +In file included from /usr/include/image.h:22:0, > + from aisimage.c:29: > +/usr/include/rgbpixel.h:22:20: fatal error: config.h: No such file or directory > + > +Signed-off-by: Alexander Stein > +--- > + tools/Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/tools/Makefile b/tools/Makefile > +index a5f989a..bc6ffe3 100644 > +--- a/tools/Makefile > ++++ b/tools/Makefile > +@@ -157,7 +157,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y)) > + # Use native tools and options > + # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps > + # > +-HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ > ++HOSTCPPFLAGS = -I $(SRCTREE)/include \ > + -idirafter $(OBJTREE)/include2 \ > + -idirafter $(OBJTREE)/include \ > + -I $(SRCTREE)/lib/libfdt \ > diff --git a/patches/u-boot-2011.12/series b/patches/u-boot-2011.12/series > new file mode 100644 > index 0000000..eea4611 > --- /dev/null > +++ b/patches/u-boot-2011.12/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-tools-Prefer-u-boot-includes-to-system-include-direc.patch > +# 944f1726d2ab9856a3d9b36c7af8e95b - git-ptx-patches magic > -- > 1.8.3.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de