From patchwork Wed Dec 2 03:57:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 9234 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id CFD538E70; Wed, 2 Dec 2015 04:59:23 +0100 (CET) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 0B4788E5B for ; Wed, 2 Dec 2015 04:59:23 +0100 (CET) Received: by wmec201 with SMTP id c201so234691930wme.0 for ; Tue, 01 Dec 2015 19:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NdoVbTudj2weUc6V+RduiAnkHIAn34l2TWBstntpMQA=; b=Z6XxExTP89t0FK+c6UEgYoZVq0LPy8OuLGd3MfsEz7Usl/JoSRcZKW94XWiUWvla90 8XlkrsfAOVZ+wOQ/hiIZYaNe6xFuFOJ+sHFahgXzBOXtma6VzYRpFJ1+FLuYRw0Wc/S9 x7jbP4fu1vmFPcpx+jDDoYd42gmUdvGAKFc+Htds++J16RQ0pPlINqHQTub+BIRm21au xnyt7iPVe9wI1fVGlHjPuGRE+afKAvg/biktFmt2WmqvFzRxpONJJ4EHbURqt8Y39OLJ gSLtK1VhBL6vAdTscAfUWN+v4AS0rphTUpx2iWo6R8RmIbkyZHeWIx0bqG98dsMmv69e qsNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NdoVbTudj2weUc6V+RduiAnkHIAn34l2TWBstntpMQA=; b=A0PV3HJEV3isx2UynA/I58ITlZkQqnoR0/2pkCwRDuYtQ8hRcs5dYt/Va1VA6dhSvP Y1iKSS3/5xFdbN663IuFuAa5f+rafXJLziu7yKTNLRb08aKr8pkNIx/DzZ6CIoBfpVGe 97P+d+sVro0LJtW9lKEh7DqjM1TO5jZHU4MW4Xj9lXm5kmBV5vf1Z+w9dcOQy0x3YeP8 mR+ESjqVwhYARCzf9YIyXjytz5WMgBQ0bn8rbCVbr3xwMTSoont2+cX8vLAsHwYhFm7V KwpkrcXVpULg8jf0LCesyNjMlMy5ErwSenuEVEIPv0f9WBWxD8uBnga18+u94/8r8AVH 4itw== X-Gm-Message-State: ALoCoQmdfhCgC3Ov4R6ma0fOgQtGO/6vYbrKMuoAAny3+tUVShMO5XO2Waiy4M7iF+m1KvR/GYO0 X-Received: by 10.194.93.6 with SMTP id cq6mr1466830wjb.165.1449028762937; Tue, 01 Dec 2015 19:59:22 -0800 (PST) Received: from XPS13.ibrowse.com ([93.158.52.3]) by smtp.gmail.com with ESMTPSA id h5sm783942wjz.21.2015.12.01.19.59.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Dec 2015 19:59:22 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 2 Dec 2015 04:57:50 +0100 Message-Id: <1449028676-19232-5-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1449028676-19232-1-git-send-email-thomas.monjalon@6wind.com> References: <1449028676-19232-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 04/10] mk: introduce new install syntax X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The old install command was: make install T=x86_64-native-linuxapp-gcc DESTDIR=install It still works and can be replaced by these more standard commands: make config T=x86_64-native-linuxapp-gcc 0=x86_64-native-linuxapp-gcc make O=x86_64-native-linuxapp-gcc make install O=x86_64-native-linuxapp-gcc prefix= DESTDIR=install It means the "make install" do not perform any compilation anymore when T is not used. It is done only in pre_install to keep compatibility with the old syntax based on T= option. Signed-off-by: Thomas Monjalon --- doc/build-sdk-quick.txt | 7 ++++--- mk/rte.sdkinstall.mk | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index 662ef63..acd1bfe 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -5,7 +5,8 @@ Build commands all same as build (default rule) build build in a configured directory clean remove files but keep configuration - install configure, build and install a target in DESTDIR + install T= configure, build and install a target in DESTDIR + install install optionally staged in DESTDIR examples build examples for given targets (T=) examples_clean clean examples for given targets (T=) Build variables @@ -17,8 +18,8 @@ Build variables CROSS toolchain prefix V verbose D debug dependencies - O build directory (default: build/ - install default: ./) - DESTDIR second-stage install directory + O build directory (default: build/ - install T= default: ./) + DESTDIR staging install directory prefix root install directory T target template - used with config or install format: diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 91273be..9b4303a 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -32,6 +32,7 @@ # Build directory is given with O= O ?= . +BUILD_DIR := $O prefix ?= /usr/local exec_prefix ?= $(prefix) @@ -46,10 +47,12 @@ sdkdir ?= $(datadir) # Configuration, compilation and installation can be done at once # with make install T= +ifdef T # The build directory is T and may be prepended with O BUILD_DIR := $O/$T # Default usage of T= will install an almost flat staging tree export prefix = +endif # Create the directory $1 if not exists rte_mkdir = test -d $1 || mkdir -p $1 @@ -60,6 +63,7 @@ rte_symlink = ln -snf $$($(RTE_SDK)/scripts/relpath.sh $1 $(dir $2)) $2 .PHONY: pre_install pre_install: +ifdef T $(Q)if [ ! -f $(BUILD_DIR)/.config ]; then \ $(MAKE) config T=$T O=$(BUILD_DIR); \ elif cmp -s $(BUILD_DIR)/.config.orig $(BUILD_DIR)/.config; then \ @@ -76,6 +80,7 @@ pre_install: echo "Using local configuration"; \ fi $(Q)$(MAKE) all O=$(BUILD_DIR) +endif .PHONY: install install: pre_install