lkml.org 
[lkml]   [2014]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: linux-next: build failure after merge of the crypto tree
On Mon, Jun 23, 2014 at 11:15:31PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
>
> On Mon, 23 Jun 2014 20:27:47 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
> >
> > That's weird as it built correctly here. This looks like a
> > make/gcc issue as the missing header file is meant to be found
> > with an additional -I.
> >
> > Could you do a make V=1 for me and show me what the gcc command-line
> > looks like?
>
> Not until tomorrow. In the mean time, could you try it with an
> external object dir i.e. "make O=..."
>
> If that breaks, I think you need to change CURDIR to srcdir or some
> such ...

Thanks for the hint Stephen. I've added the following fix which
hopefully should fix the problem.

commit e60b244281cfe03ddd7c5c15c4e6b6d6316bb530
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon Jun 23 21:37:53 2014 +0800

crypto: qat - Fix build problem with O=

qat adds -I to the ccflags. Unfortunately it uses CURDIR which
breaks when make is invoked with O=. This patch replaces CURDIR
with $(src) which should work with/without O=.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_dh895xcc/Makefile b/drivers/crypto/qat/qat_dh895xcc/Makefile
index 8e4924d..25171c5 100644
--- a/drivers/crypto/qat/qat_dh895xcc/Makefile
+++ b/drivers/crypto/qat/qat_dh895xcc/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -I$(CURDIR)/drivers/crypto/qat/qat_common
+ccflags-y := -I$(src)/../qat_common
obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) += qat_dh895xcc.o
qat_dh895xcc-objs := adf_drv.o \
adf_isr.o \
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt


\
 
 \ /
  Last update: 2014-06-23 16:41    [W:0.040 / U:1.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site