[Buildroot] [PATCH v4 1/2] eigen: follow default installation scheme

[Buildroot] [PATCH v4 1/2] eigen: follow default installation scheme

[Davide Viti]

eigen's build-system (cmake), by default, installs the header files
in /usr/include/eigen3

Signed-off-by: Davide Viti <d.viti@infosolution.it>
---
 Changes v3 -> v4:
   - install files into $(STAGING_DIR)/usr/include/eigen3
   - use EIGEN_DEST_DIR to reduce name duplication

 package/eigen/eigen.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 5abd464..9a5ce7d 100644
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -12,12 +12,14 @@ EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
 EIGEN_INSTALL_STAGING = YES
 EIGEN_INSTALL_TARGET = NO
+EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3
 
 # This package only consists of headers that need to be
 # copied over to the sysroot for compile time use
 define EIGEN_INSTALL_STAGING_CMDS
-	$(RM) -r $(STAGING_DIR)/usr/include/Eigen
-	cp -a $(@D)/Eigen $(STAGING_DIR)/usr/include/
+	$(RM) -r $(EIGEN_DEST_DIR)
+	mkdir -p $(EIGEN_DEST_DIR)
+	cp -a $(@D)/Eigen $(EIGEN_DEST_DIR)
 endef
 
 $(eval $(generic-package))
-- 
1.9.0

[Buildroot] [PATCH v4 2/2] eigen: add an option to install unsupported modules

[Davide Viti]

Signed-off-by: Davide Viti <d.viti@infosolution.it>
---
 Changes v3 -> v4:
   - install "unsupported" modules inside /usr/include/eigen3/unsupported

 package/eigen/Config.in | 8 ++++++++
 package/eigen/eigen.mk  | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/package/eigen/Config.in b/package/eigen/Config.in
index e94f9a3..fbada98 100644
--- a/package/eigen/Config.in
+++ b/package/eigen/Config.in
@@ -13,5 +13,13 @@ config BR2_PACKAGE_EIGEN
 
 	  http://eigen.tuxfamily.org/
 
+if BR2_PACKAGE_EIGEN
+
+config BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES
+       bool "unsupported modules"
+       help
+         Install eigen unsupported modules
+endif
+
 comment "eigen needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 9a5ce7d..ac030a9 100644
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -14,12 +14,19 @@ EIGEN_INSTALL_STAGING = YES
 EIGEN_INSTALL_TARGET = NO
 EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3
 
+ifeq ($(BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES),y)
+define EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS
+	cp -a $(@D)/unsupported $(EIGEN_DEST_DIR)
+endef
+endif
+
 # This package only consists of headers that need to be
 # copied over to the sysroot for compile time use
 define EIGEN_INSTALL_STAGING_CMDS
 	$(RM) -r $(EIGEN_DEST_DIR)
 	mkdir -p $(EIGEN_DEST_DIR)
 	cp -a $(@D)/Eigen $(EIGEN_DEST_DIR)
+	$(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS)
 endef
 
 $(eval $(generic-package))
-- 
1.9.0

[Buildroot] [PATCH v4 2/2] eigen: add an option to install unsupported modules

[Thomas Petazzoni]

Dear Davide Viti,

On Wed, 19 Mar 2014 16:48:54 +0100, Davide Viti wrote:

> +config BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES
> +       bool "unsupported modules"
> +       help

Indentation should be done with one tab, not spaces.

> +         Install eigen unsupported modules

Indentation should be one tab + two spaces.



> +endif
> +
>  comment "eigen needs a toolchain w/ C++"
>  	depends on !BR2_INSTALL_LIBSTDCPP
> diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
> index 9a5ce7d..ac030a9 100644
> --- a/package/eigen/eigen.mk
> +++ b/package/eigen/eigen.mk
> @@ -14,12 +14,19 @@ EIGEN_INSTALL_STAGING = YES
>  EIGEN_INSTALL_TARGET = NO
>  EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3
>  
> +ifeq ($(BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES),y)
> +define EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS
> +	cp -a $(@D)/unsupported $(EIGEN_DEST_DIR)
> +endef
> +endif
> +
>  # This package only consists of headers that need to be
>  # copied over to the sysroot for compile time use
>  define EIGEN_INSTALL_STAGING_CMDS
>  	$(RM) -r $(EIGEN_DEST_DIR)
>  	mkdir -p $(EIGEN_DEST_DIR)
>  	cp -a $(@D)/Eigen $(EIGEN_DEST_DIR)
> +	$(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS)

Here the indentation is correct, it's done with one tab.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v4 1/2] eigen: follow default installation scheme

[Thomas Petazzoni]

Dear Davide Viti,

On Wed, 19 Mar 2014 16:48:53 +0100, Davide Viti wrote:
> eigen's build-system (cmake), by default, installs the header files
> in /usr/include/eigen3

I must have missed something, but if eigen's build-system is cmake, why
do we use generic-package and do the installation manually, instead of
using cmake-package?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com