d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mk: introduce new install syntax

Browse Source 
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.

The default prefix /usr/local is empty in the T= case which is
used only for a local install.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Panu Matilainen <pmatilai@redhat.com>
This commit is contained in:
Thomas Monjalon 2015-12-01 15:04:01 +01:00
parent 6b62a72a70
commit fae202e2e2
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/build-sdk-quick.txt
View File

@ -5,7 +5,8 @@ Build commands
all same as build (default rule) all same as build (default rule)
build build in a configured directory build build in a configured directory
clean remove files but keep configuration 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 build examples for given targets (T=)
examples_clean clean examples for given targets (T=) examples_clean clean examples for given targets (T=)
Build variables Build variables
@ -17,8 +18,8 @@ Build variables
CROSS toolchain prefix CROSS toolchain prefix
V verbose V verbose
D debug dependencies D debug dependencies
O build directory (default: build/ - install default: ./) O build directory (default: build/ - install T= default: ./)
DESTDIR second-stage install directory DESTDIR staging install directory
prefix root install directory prefix root install directory
T target template - used with config or install T target template - used with config or install
format: <arch-machine-execenv-toolchain> format: <arch-machine-execenv-toolchain>

4
doc/guides/prog_guide/dev_kit_root_make_help.rst
View File

@ -107,8 +107,6 @@ Install Targets
* Install * Install
Build the DPDK binary.
The name of the target to install is specified using T=mytarget.
The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix). The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix).
The GNU standards variables may be used: The GNU standards variables may be used:
@ -119,7 +117,7 @@ Install Targets
.. code-block:: console .. code-block:: console
make install T=x86_64-native-linuxapp-gcc prefix=/usr make install DESTDIR=myinstall prefix=/usr
Test Targets Test Targets
------------ ------------

12
mk/rte.sdkinstall.mk
View File

@ -33,11 +33,21 @@
# Configuration, compilation and installation can be done at once # Configuration, compilation and installation can be done at once
# with make install T=<config> # with make install T=<config>
ifdef T # config, build and install combined
# The build directory is T and may be prepended with O # The build directory is T and may be prepended with O
O ?= . O ?= .
RTE_OUTPUT := $O/$T RTE_OUTPUT := $O/$T
else # standard install
# Build directory is given with O=
O ?= build
RTE_OUTPUT := $O
endif
ifdef T # defaults with T= will install an almost flat staging tree
export prefix ?=
else
prefix ?= /usr/local prefix ?= /usr/local
endif
exec_prefix ?= $(prefix) exec_prefix ?= $(prefix)
bindir ?= $(exec_prefix)/bin bindir ?= $(exec_prefix)/bin
libdir ?= $(exec_prefix)/lib libdir ?= $(exec_prefix)/lib
@ -58,6 +68,7 @@ rte_symlink = ln -snf $$($(RTE_SDK)/scripts/relpath.sh $1 $(dir $2)) $2
.PHONY: pre_install .PHONY: pre_install
pre_install: pre_install:
ifdef T
$(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \
$(MAKE) config O=$(RTE_OUTPUT); \ $(MAKE) config O=$(RTE_OUTPUT); \
elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \
@ -74,6 +85,7 @@ pre_install:
echo "Using local configuration"; \ echo "Using local configuration"; \
fi fi
$(Q)$(MAKE) all O=$(RTE_OUTPUT) $(Q)$(MAKE) all O=$(RTE_OUTPUT)
endif
.PHONY: install .PHONY: install
install: install: