Skip to contentSkip to conversation

package/pkg-cmake.mk: fix indent

PATCH New Peter Seiderer 3 participants 8 messages Jan 18, 2021 – Jan 19, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/pkg-cmake.mk: fix indent

---
 package/pkg-cmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-cmake.mk +1 -1
index 3ee7067250..c001051002 100644
@@ -58,7 +58,7 @@ $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
 $(2)_INSTALL_OPTS		?= install
 $(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install/fast
-$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install/fast
+$(2)_INSTALL_TARGET_OPTS	?= DESTDIR=$$(TARGET_DIR) install/fast
 
 $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES
 
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/3 docs: fix cmake-package _INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS description

Since commit dfcc18f84b0d90b0ed5937bac3c4b12aba086cd5 cmake-package _INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS use 'install/fast' instead of 'install', adjust documentation accordingly.

---
 docs/manual/adding-packages-cmake.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
docs/manual/adding-packages-cmake.txt +2 -2
index 6ccf3902f8..00974d30d8 100644
@@ -128,12 +128,12 @@ typical packages will therefore only use a few of them.
 
 * +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
   install the package to the staging directory. By default, the value
-  is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
+  is +DESTDIR=$(STAGING_DIR) install/fast+, which is correct for most
   CMake packages. It is still possible to override it.
 
 * +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to
   install the package to the target directory. By default, the value
-  is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
+  is +DESTDIR=$(TARGET_DIR) install/fast+. The default value is correct
   for most CMake packages, but it is still possible to override it if
   needed.
 
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 docs: fix cmake-package _INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS description

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Since commit dfcc18f84b0d90b0ed5937bac3c4b12aba086cd5 cmake-package _INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS use 'install/fast' instead of 'install', adjust documentation accordingly.

Committed to 2020.02.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/3 docs: add cmake-package _INSTALL_OPTS description

In reply to Peter Seiderer

---
Notes:
- why _INSTALL_OPTS and not _INSTALL_HOST_OPTS (besides historically reasons)?
- mabe the cmake _INSTALL_OPTS is so seldom used, so not worth an extra doc entry?

---
 docs/manual/adding-packages-cmake.txt | 5 +++++
 1 file changed, 5 insertions(+)
docs/manual/adding-packages-cmake.txt +5 -0
index 00974d30d8..73f0943024 100644
@@ -126,6 +126,11 @@ typical packages will therefore only use a few of them.
   in the build step. These are passed after the +make+ command. By
   default, empty.
 
+* +LIBFOO_INSTALL_OPTS+ contains the make options used to
+  install the package to the host directory. By default, the value
+  is +install+, which is correct for most CMake packages. It is still
+  possible to override it.
+
 * +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
   install the package to the staging directory. By default, the value
   is +DESTDIR=$(STAGING_DIR) install/fast+, which is correct for most
Signature · 1 line
2.29.2
#4 lore raw

PATCH 3/3 docs: add cmake-package _INSTALL_OPTS description

Quoted 5 lines · On Mon, 18 Jan 2021 22:27:00 +0100 Peter Seiderer <[email protected]> wrote:

---
Notes:
- why _INSTALL_OPTS and not _INSTALL_HOST_OPTS (besides historically reasons)?

Note that we have the same naming in the autotools-package infrastructure.

Quoted 2 lines

- mabe the cmake _INSTALL_OPTS is so seldom used, so not worth an extra doc entry?

I've applied anyway, it's meant to be overridden if needed.

However, why are we using install/fast for the target installation, but not for the host installation ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 3/3 docs: add cmake-package _INSTALL_OPTS description

In reply to Peter Seiderer
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

---
Notes:
- why _INSTALL_OPTS and not _INSTALL_HOST_OPTS (besides historically reasons)?
- mabe the cmake _INSTALL_OPTS is so seldom used, so not worth an extra doc entry?

Committed to 2020.02.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard