From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 04/10] mk: introduce new install syntax
Date: Wed, 2 Dec 2015 04:57:50 +0100 [thread overview]
Message-ID: <1449028676-19232-5-git-send-email-thomas.monjalon@6wind.com> (raw)
In-Reply-To: <1449028676-19232-1-git-send-email-thomas.monjalon@6wind.com>
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 <thomas.monjalon@6wind.com>
---
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: <arch-machine-execenv-toolchain>
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=<config>
+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
--
2.5.2
next prev parent reply other threads:[~2015-12-02 3:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 3:57 [dpdk-dev] [PATCH 00/10] standard make install Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 01/10] mk: remove multi-target install Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 02/10] mk: move installation procedure in install rule Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 03/10] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-02 10:27 ` Panu Matilainen
2015-12-02 11:25 ` Thomas Monjalon
2015-12-02 12:54 ` Panu Matilainen
2015-12-02 13:05 ` Thomas Monjalon
2015-12-02 13:29 ` Panu Matilainen
2015-12-02 3:57 ` Thomas Monjalon [this message]
2015-12-02 3:57 ` [dpdk-dev] [PATCH 05/10] mk: split install rule Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 06/10] mk: install kernel modules Thomas Monjalon
2015-12-02 9:53 ` Panu Matilainen
2015-12-02 10:09 ` Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 07/10] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-02 9:58 ` Panu Matilainen
2015-12-02 3:57 ` [dpdk-dev] [PATCH 08/10] mk: install doc Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 09/10] mk: install examples Thomas Monjalon
2015-12-02 3:57 ` [dpdk-dev] [PATCH 10/10] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-02 7:44 ` [dpdk-dev] [PATCH 00/10] standard make install Panu Matilainen
2015-12-02 9:25 ` Thomas Monjalon
2015-12-02 9:47 ` Panu Matilainen
2015-12-02 10:07 ` Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 00/12] " Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 01/12] mk: remove testall Thomas Monjalon
2015-12-03 5:01 ` [dpdk-dev] [PATCH v2 02/12] mk: remove multi-target install Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 03/12] mk: move installation procedure in install rule Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 04/12] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 05/12] mk: introduce new install syntax Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 06/12] mk: split install rule Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 07/12] mk: install kernel modules Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 08/12] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 09/12] mk: install doc Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 10/12] mk: install examples Thomas Monjalon
2015-12-03 13:19 ` Panu Matilainen
2015-12-03 13:32 ` Thomas Monjalon
2015-12-03 13:35 ` Panu Matilainen
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 11/12] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-03 5:02 ` [dpdk-dev] [PATCH v2 12/12] pkg: update RPM with standard install Thomas Monjalon
2015-12-03 10:57 ` [dpdk-dev] [PATCH v2 00/12] standard make install Bruce Richardson
2015-12-03 11:02 ` Thomas Monjalon
2015-12-03 11:06 ` Thomas Monjalon
2015-12-03 11:10 ` Bruce Richardson
2015-12-03 11:07 ` Bruce Richardson
2015-12-03 13:26 ` Panu Matilainen
2015-12-03 13:34 ` Thomas Monjalon
2015-12-03 15:52 ` Arevalo, Mario Alfredo C
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 00/13] " Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 01/13] mk: remove testall Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 02/13] mk: remove multi-target install Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 03/13] mk: move installation procedure in install rule Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 04/13] mk: install a standard cutomizable tree Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 05/13] mk: introduce new install syntax Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 06/13] mk: split install rule Thomas Monjalon
2015-12-07 23:22 ` Arevalo, Mario Alfredo C
2015-12-07 23:51 ` Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 07/13] mk: install kernel modules Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 08/13] mk: install binding tool in sbin directory Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 09/13] mk: install doc Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 10/13] mk: install examples Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 11/13] app/proc_info: rename binary with prefix Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 12/13] pkg: update RPM with standard install Thomas Monjalon
2015-12-03 13:45 ` [dpdk-dev] [PATCH v3 13/13] maintainers: take responsibility for build system Thomas Monjalon
2015-12-04 9:40 ` Olivier MATZ
2015-12-03 15:31 ` [dpdk-dev] [PATCH v3 00/13] standard make install Bruce Richardson
2015-12-03 17:05 ` Thomas Monjalon
2015-12-06 15:00 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449028676-19232-5-git-send-email-thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).