diff mbox series

[RFC,1/3] cve/cve-2014-0196: Don't use libutil for Android

Message ID 20190411233115.32744-2-pvorel@suse.cz
State Accepted
Delegated to: Petr Vorel
Headers show
Series Android fixes and -Werror-implicit-function-declaration as default | expand

Commit Message

Petr Vorel April 11, 2019, 11:31 p.m. UTC 
From: Petr Vorel <petr.vorel@gmail.com>

as it's not available for it.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/cve/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Sandeep Patil April 12, 2019, 7:39 p.m. UTC | #1 
On Fri, Apr 12, 2019 at 01:31:13AM +0200, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> as it's not available for it.
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>

We've needed this for a while now and I always end up removing
the libutil reference in the auto-generated gen.bp file. Thanks for
fixing this Petr.

Acked-by: Sandeep Patil <sspatil@android.com>
Petr Vorel April 14, 2019, 9:59 a.m. UTC | #2 
Hi Sandeep,

> On Fri, Apr 12, 2019 at 01:31:13AM +0200, Petr Vorel wrote:
> > From: Petr Vorel <petr.vorel@gmail.com>

> > as it's not available for it.

> > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > Signed-off-by: Petr Vorel <pvorel@suse.cz>

> We've needed this for a while now and I always end up removing
> the libutil reference in the auto-generated gen.bp file. Thanks for
> fixing this Petr.

> Acked-by: Sandeep Patil <sspatil@android.com>
Thanks for your review, pushed this one.


Kind regards,
Petr
diff mbox series

Patch

diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
index 6dc401cff..da44fff60 100644
--- a/testcases/cve/Makefile
+++ b/testcases/cve/Makefile
@@ -27,7 +27,11 @@  cve-2016-7117:	CFLAGS += -pthread
 cve-2016-7117:	LDLIBS += -lrt
 
 cve-2014-0196:  CFLAGS += -pthread
-cve-2014-0196:  LDLIBS += -lrt -lutil
+cve-2014-0196:  LDLIBS += -lrt
+
+ifneq ($(ANDROID),1)
+cve-2014-0196:  LDLIBS += -lutil
+endif
 
 cve-2017-2671:	CFLAGS += -pthread
 cve-2017-2671:	LDLIBS += -lrt