From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CF5C76186 for ; Wed, 24 Jul 2019 21:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B564C2054F for ; Wed, 24 Jul 2019 21:07:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbfGXVHW (ORCPT ); Wed, 24 Jul 2019 17:07:22 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:54094 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387978AbfGXVHW (ORCPT ); Wed, 24 Jul 2019 17:07:22 -0400 Received: from patrickm (unknown [100.42.98.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: chutzpah) by smtp.gentoo.org (Postfix) with ESMTPSA id 915DE3487FD; Wed, 24 Jul 2019 21:07:21 +0000 (UTC) Date: Wed, 24 Jul 2019 14:07:19 -0700 From: Patrick McLean To: Steven Rostedt Cc: Linux Trace Devel , howaboutsynergy@pm.me Subject: Re: trace-cmd: Only add udis86 CFLAGS and LDFLAGS if it is found Message-ID: <20190724140719.558fddbd@patrickm> In-Reply-To: <20190724151349.405d146b@gandalf.local.home> References: <20190724151349.405d146b@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org On Wed, 24 Jul 2019 15:13:49 -0400 Steven Rostedt wrote: > [ Patrick, I don't have udis86 on my machines, can you test to see if > this will include it if you do not set NO_UDIS86? ] > > As we need to update both LDFLAGS and CFLAGS, move the test to see if > udisc86 is installed to a variable, and then set NO_UDIS86 if it is > not found. This way we do not need to test if it exists twice, nor > have LDFLAGS set unconditionally. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204277 > > Reported-by: howaboutsynergy@pm.me > Signed-off-by: Steven Rostedt (VMware) > --- > diff --git a/Makefile b/Makefile > index 0aa98517..e98535ea 100644 > --- a/Makefile > +++ b/Makefile > @@ -136,9 +136,14 @@ export NO_PYTHON > test-build = $(if $(shell sh -c 'echo "$(1)" | \ > $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), > $2) > +UDIS86_AVAILABLE := $(call test-build,\#include , y) > +ifneq ($(UDIS86_AVAILABLE), y) The value of UDIS86_AVAILABLE ends up having whitespace, so this line always fails. If you change it to the line below, it works. ifneq ($(strip $(UDIS86_AVAILABLE)), y) > +NO_UDIS86 := 1 > +endif > + > ifndef NO_UDIS86 > # have udis86 disassembler library? > -udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 > -ludis86) +udis86-flags := -DHAVE_UDIS86 -ludis86 > udis86-ldflags := -ludis86 > endif # NO_UDIS86 >