From patchwork Thu Jan 19 18:46:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirantan Ekbote X-Patchwork-Id: 9526649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A30760437 for ; Thu, 19 Jan 2017 18:48:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFB9F28586 for ; Thu, 19 Jan 2017 18:48:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E493028616; Thu, 19 Jan 2017 18:48:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68C812860D for ; Thu, 19 Jan 2017 18:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754414AbdASSrt (ORCPT ); Thu, 19 Jan 2017 13:47:49 -0500 Received: from mail-pg0-f44.google.com ([74.125.83.44]:36473 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754379AbdASSrI (ORCPT ); Thu, 19 Jan 2017 13:47:08 -0500 Received: by mail-pg0-f44.google.com with SMTP id t6so16215064pgt.3 for ; Thu, 19 Jan 2017 10:47:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=t7PiUn3w4XYgr82LbfvVfs0S+QfFtwwy14X+81ybqzc=; b=ZQ1oMHk8aQ/Fved49Y9SIZ+J44rQq4lJmzb/BNGaR472QeT4qXe0aDNHlx3aFTqLTD wlQqDCd8t7oARyRZXkswm2dabdFa9Rh9mLLRUe/5rpZ3xT6nThrpfZnePO9HWR2SsQMM mev2xqynyqEUoNfcpzB2n8J70NrP7JyGTdcS4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=t7PiUn3w4XYgr82LbfvVfs0S+QfFtwwy14X+81ybqzc=; b=F/LpVt+7hvFGQV0rfTeW2zgd1VwDHIsNPaH1JxKTFrLluBji79n6nMvZY77e3JahFB 0lAK44uwpiWeFrYeWQf0Ok0C9+FENn/zYpcMI9BIp0oeYLD1W481PHSyCmz161FPVSi6 d1AakgYB73erBwima+dniejYb4Eb9GtB8N4TxKTaFzfo1IU17pN/6ZhxCXDwC1Y29yJ1 tCPfspK39mt6/Tx0O7IuLuo2KUBTuUvxY/5lGTRKeGioc7az7xRFzMkSc4WmWZn40rme syi9PXDdO9iei5KIKH2fsWCXy3k0phxpzFIVfjjNXnQoRbc+w0O6mRP2YbIjaJTIUQVl XjFQ== X-Gm-Message-State: AIkVDXLRIIxRuHTo8WvkhKPm+DJeaxH26HP3g9gw7uZF5pnKjoPAFV4yNJLs8MVyOxn1MJ0G X-Received: by 10.99.134.199 with SMTP id x190mr12053589pgd.68.1484851623859; Thu, 19 Jan 2017 10:47:03 -0800 (PST) Received: from endor.mtv.corp.google.com ([172.22.152.12]) by smtp.gmail.com with ESMTPSA id j7sm10536028pfe.84.2017.01.19.10.47.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 10:47:03 -0800 (PST) From: Chirantan Ekbote To: kvm@vger.kernel.org Cc: dgreid@chromium.org, vapier@chromium.org, Chirantan Ekbote Subject: [PATCH] kvmtool: Allow optional libraries to be forced off Date: Thu, 19 Jan 2017 10:46:22 -0800 Message-Id: <20170119184622.11461-1-chirantan@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The makefile currently automatically detects if certain optional libraries are present on the file system and links with them if they are. This isn't always desired though: users may not want to link against those libraries even if they do exist. Add new variables that when set to 0 will force the corresponding optional library off. Signed-off-by: Chirantan Ekbote Acked-by: Mike Frysinger --- Makefile | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index eeb54a4..69daa1e 100644 --- a/Makefile +++ b/Makefile @@ -250,26 +250,33 @@ ifeq (y,$(ARCH_HAS_FRAMEBUFFER)) endif endif -ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz),y) - CFLAGS_DYNOPT += -DCONFIG_HAS_ZLIB - LIBS_DYNOPT += -lz -else - NOTFOUND += zlib -endif -ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz -static),y) - CFLAGS_STATOPT += -DCONFIG_HAS_ZLIB - LIBS_STATOPT += -lz -endif +# Define USE_ZLIB=0 to disable zlib. +ifneq ($(USE_ZLIB),0) + ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz),y) + CFLAGS_DYNOPT += -DCONFIG_HAS_ZLIB + LIBS_DYNOPT += -lz + else + NOTFOUND += zlib + endif -ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio),y) - CFLAGS_DYNOPT += -DCONFIG_HAS_AIO - LIBS_DYNOPT += -laio -else - NOTFOUND += aio + ifeq ($(call try-build,$(SOURCE_ZLIB),$(CFLAGS),$(LDFLAGS) -lz -static),y) + CFLAGS_STATOPT += -DCONFIG_HAS_ZLIB + LIBS_STATOPT += -lz + endif endif -ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio -static),y) - CFLAGS_STATOPT += -DCONFIG_HAS_AIO - LIBS_STATOPT += -laio + +# Define USE_AIO=0 to disable libaio. +ifneq ($(USE_AIO),0) + ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio),y) + CFLAGS_DYNOPT += -DCONFIG_HAS_AIO + LIBS_DYNOPT += -laio + else + NOTFOUND += aio + endif + ifeq ($(call try-build,$(SOURCE_AIO),$(CFLAGS),$(LDFLAGS) -laio -static),y) + CFLAGS_STATOPT += -DCONFIG_HAS_AIO + LIBS_STATOPT += -laio + endif endif ifeq ($(LTO),1)