[Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory
@ 2015-02-17 17:55 Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-17 17:55 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

For some cmake based packages, like GNURadio, it's forbidden to do the
compilation directly in the sources directory. This patch add a new 
variable to specify, if needed, the name of a sub-directory used to compile.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/pkg-cmake.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 6c9955d..20243aa 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -57,7 +57,11 @@ $(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
 
 $(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
+ifneq ($$($2)_BUILD_DIR,)
+$(2)_BUILDDIR                  = $$($(2)_SRCDIR)/$$($(2)_BUILD_DIR)
+else
 $(2)_BUILDDIR			= $$($(2)_SRCDIR)
+endif
 
 #
 # Configure step. Only define it if not already defined by the package
@@ -69,7 +73,8 @@ ifeq ($(4),target)
 
 # Configure package for target
 define $(2)_CONFIGURE_CMDS
-	(cd $$($$(PKG)_BUILDDIR) && \
+	(mkdir -p $$($$(PKG)_BUILDDIR) && \
+	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
 	PATH=$$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
@@ -93,7 +98,8 @@ else
 
 # Configure package for host
 define $(2)_CONFIGURE_CMDS
-	(cd $$($$(PKG)_BUILDDIR) && \
+	(mkdir -p $$($$(PKG)_BUILDDIR) && \
+	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
 	PATH=$$(BR_PATH) \
 	$$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
-- 
2.0.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/4] python-cheetah: add host-package support
  2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
@ 2015-02-17 17:55 ` Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 3/4] python-markdown: " Gwenhael Goavec-Merou
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-17 17:55 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

Some packages, like GNURadio for VOLK, needs cheetah on host at buildtime.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/python-cheetah/python-cheetah.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk
index 08076b5..faf2436 100644
--- a/package/python-cheetah/python-cheetah.mk
+++ b/package/python-cheetah/python-cheetah.mk
@@ -9,5 +9,7 @@ PYTHON_CHEETAH_SOURCE = Cheetah-$(PYTHON_CHEETAH_VERSION).tar.gz
 PYTHON_CHEETAH_SITE = http://pypi.python.org/packages/source/C/Cheetah
 PYTHON_CHEETAH_LICENSE = MIT
 PYTHON_CHEETAH_SETUP_TYPE = setuptools
+PYTHON_CHEETAH_DEPENDENCIES += host-python-markdown
 
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.0.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 3/4] python-markdown: add host-package support
  2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
@ 2015-02-17 17:55 ` Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 4/4] GNURadio: new package Gwenhael Goavec-Merou
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-17 17:55 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

Host-cheetah needs host-markdown.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/python-markdown/python-markdown.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk
index 864825e..3b2217e 100644
--- a/package/python-markdown/python-markdown.mk
+++ b/package/python-markdown/python-markdown.mk
@@ -12,3 +12,4 @@ PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md
 PYTHON_MARKDOWN_SETUP_TYPE = distutils
 
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.0.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 4/4] GNURadio: new package
  2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
  2015-02-17 17:55 ` [Buildroot] [PATCH 3/4] python-markdown: " Gwenhael Goavec-Merou
@ 2015-02-17 17:55 ` Gwenhael Goavec-Merou
  2015-02-25  9:40 ` [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory gwenhael.goavec
  2015-02-25 13:43 ` Samuel Martin
  4 siblings, 0 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-17 17:55 UTC (permalink / raw)
  To: buildroot

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/Config.in            |  1 +
 package/gnuradio/Config.in   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 package/gnuradio/gnuradio.mk | 24 ++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 package/gnuradio/Config.in
 create mode 100644 package/gnuradio/gnuradio.mk

diff --git a/package/Config.in b/package/Config.in
index fe3d3d0..37235d5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1034,6 +1034,7 @@ menu "Miscellaneous"
 	source "package/clamav/Config.in"
 	source "package/collectd/Config.in"
 	source "package/empty/Config.in"
+	source "package/gnuradio/Config.in"
 	source "package/googlefontdirectory/Config.in"
 	source "package/haveged/Config.in"
 	source "package/mcrypt/Config.in"
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
new file mode 100644
index 0000000..826e6fc
--- /dev/null
+++ b/package/gnuradio/Config.in
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_GNURADIO
+	bool "GNURadio"
+	depends on BR2_INET_IPV6
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_DATE_TIME
+	select BR2_PACKAGE_BOOST_FILESYSTEM
+	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	select BR2_PACKAGE_BOOST_PYTHON
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_BOOST_TEST
+	select BR2_PACKAGE_BOOST_THREAD
+	select BR2_PACKAGE_PYTHON
+
+	help
+	  GNU Radio is a free & open-source software development toolkit that
+	  provides signal processing blocks to implement software radios. It can be
+	  used with readily-available low-cost external RF hardware to create
+	  software-defined radios, or without hardware in a simulation-like
+	  environment. It is widely used in hobbyist, academic and commercial
+	  environments to support both wireless communications research and
+	  real-world radio systems.
+
+	  http://gnuradio.org/
+
+comment "GNURadio needs a toolchain w/ C++, mmu, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_MMU \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS \
+		&& BR2_LARGEFILE && BR2_INET_IPV6)
+
+
+if BR2_PACKAGE_GNURADIO
+
+config BR2_PACKAGE_GNURADIO_BLOCKS
+	bool "gnuradio-blocks"
+
+config BR2_PACKAGE_GNURADIO_PYTHON
+	bool "gnuradio-python"
+
+endif
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
new file mode 100644
index 0000000..9ea8db9
--- /dev/null
+++ b/package/gnuradio/gnuradio.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# gnuradio
+#
+################################################################################
+
+GNURADIO_VERSION = 2bb2b31476cb33e9c1bbb196fffba3a857b4f75a
+GNURADIO_SITE = git://git.gnuradio.org/gnuradio
+GNURADIO_LICENSE = GPLv3+
+GNURADIO_LICENSE_FILES = COPYING
+
+GNURADIO_BUILD_DIR = build
+#needed for volk compile
+GNURADIO_DEPENDENCIES += host-python-cheetah
+GNURADIO_DEPENDENCIES += host-swig host-boost boost
+GNURADIO_INSTALL_STAGING = YES
+
+GNURADIO_CONF_OPTS += -DENABLE_DEFAULT=OFF -DENABLE_TESTING=OFF
+GNURADIO_CONF_OPTS += -DENABLE_VOLK=ON -DENABLE_GNURADIO_RUNTIME=ON
+
+GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=$(if $(BR2_PACKAGE_GNURADIO_BLOCKS),ON,OFF)
+GNURADIO_CONF_OPTS += -DENABLE_PYTHON=$(if $(BR2_PACKAGE_GNURADIO_PYTHON),ON,OFF)
+
+$(eval $(cmake-package))
-- 
2.0.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory
  2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
                   ` (2 preceding siblings ...)
  2015-02-17 17:55 ` [Buildroot] [PATCH 4/4] GNURadio: new package Gwenhael Goavec-Merou
@ 2015-02-25  9:40 ` gwenhael.goavec
  2015-02-25 13:43 ` Samuel Martin
  4 siblings, 0 replies; 6+ messages in thread
From: gwenhael.goavec @ 2015-02-25  9:40 UTC (permalink / raw)
  To: buildroot

up

On Tue, 17 Feb 2015 18:55:11 +0100
Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:

> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> For some cmake based packages, like GNURadio, it's forbidden to do the
> compilation directly in the sources directory. This patch add a new 
> variable to specify, if needed, the name of a sub-directory used to compile.
> 
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> ---
>  package/pkg-cmake.mk | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> index 6c9955d..20243aa 100644
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -57,7 +57,11 @@ $(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
>  $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
>  
>  $(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
> +ifneq ($$($2)_BUILD_DIR,)
> +$(2)_BUILDDIR                  = $$($(2)_SRCDIR)/$$($(2)_BUILD_DIR)
> +else
>  $(2)_BUILDDIR			= $$($(2)_SRCDIR)
> +endif
>  
>  #
>  # Configure step. Only define it if not already defined by the package
> @@ -69,7 +73,8 @@ ifeq ($(4),target)
>  
>  # Configure package for target
>  define $(2)_CONFIGURE_CMDS
> -	(cd $$($$(PKG)_BUILDDIR) && \
> +	(mkdir -p $$($$(PKG)_BUILDDIR) && \
> +	cd $$($$(PKG)_BUILDDIR) && \
>  	rm -f CMakeCache.txt && \
>  	PATH=$$(BR_PATH) \
>  	$$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> @@ -93,7 +98,8 @@ else
>  
>  # Configure package for host
>  define $(2)_CONFIGURE_CMDS
> -	(cd $$($$(PKG)_BUILDDIR) && \
> +	(mkdir -p $$($$(PKG)_BUILDDIR) && \
> +	cd $$($$(PKG)_BUILDDIR) && \
>  	rm -f CMakeCache.txt && \
>  	PATH=$$(BR_PATH) \
>  	$$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory
  2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
                   ` (3 preceding siblings ...)
  2015-02-25  9:40 ` [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory gwenhael.goavec
@ 2015-02-25 13:43 ` Samuel Martin
  4 siblings, 0 replies; 6+ messages in thread
From: Samuel Martin @ 2015-02-25 13:43 UTC (permalink / raw)
  To: buildroot

Hi Gwenhael,

On Tue, Feb 17, 2015 at 6:55 PM, Gwenhael Goavec-Merou
<gwenj@trabucayre.com> wrote:
> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
>
> For some cmake based packages, like GNURadio, it's forbidden to do the
> compilation directly in the sources directory. This patch add a new
> variable to specify, if needed, the name of a sub-directory used to compile.
>
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> ---
>  package/pkg-cmake.mk | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> index 6c9955d..20243aa 100644
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -57,7 +57,11 @@ $(2)_INSTALL_STAGING_OPTS    ?= DESTDIR=$$(STAGING_DIR) install
>  $(2)_INSTALL_TARGET_OPTS               ?= DESTDIR=$$(TARGET_DIR) install
>
>  $(2)_SRCDIR                    = $$($(2)_DIR)/$$($(2)_SUBDIR)
> +ifneq ($$($2)_BUILD_DIR,)
> +$(2)_BUILDDIR                  = $$($(2)_SRCDIR)/$$($(2)_BUILD_DIR)
> +else
>  $(2)_BUILDDIR                  = $$($(2)_SRCDIR)

I suggest you just do something similar to what is done in the generic
infra [1].

> +endif
>
>  #
>  # Configure step. Only define it if not already defined by the package
> @@ -69,7 +73,8 @@ ifeq ($(4),target)
>
>  # Configure package for target
>  define $(2)_CONFIGURE_CMDS
> -       (cd $$($$(PKG)_BUILDDIR) && \
> +       (mkdir -p $$($$(PKG)_BUILDDIR) && \
> +       cd $$($$(PKG)_BUILDDIR) && \
>         rm -f CMakeCache.txt && \
>         PATH=$$(BR_PATH) \
>         $$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> @@ -93,7 +98,8 @@ else
>
>  # Configure package for host
>  define $(2)_CONFIGURE_CMDS
> -       (cd $$($$(PKG)_BUILDDIR) && \
> +       (mkdir -p $$($$(PKG)_BUILDDIR) && \
> +       cd $$($$(PKG)_BUILDDIR) && \
>         rm -f CMakeCache.txt && \
>         PATH=$$(BR_PATH) \
>         $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
> --
> 2.0.5
>

Regards,

[1] http://git.buildroot.org/buildroot/tree/package/pkg-generic.mk#n350

-- 
Samuel

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-02-25 13:43 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-17 17:55 [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
2015-02-17 17:55 ` [Buildroot] [PATCH 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
2015-02-17 17:55 ` [Buildroot] [PATCH 3/4] python-markdown: " Gwenhael Goavec-Merou
2015-02-17 17:55 ` [Buildroot] [PATCH 4/4] GNURadio: new package Gwenhael Goavec-Merou
2015-02-25  9:40 ` [Buildroot] [PATCH 1/4] pkg-cmake: allow to build package in a subdirectory gwenhael.goavec
2015-02-25 13:43 ` Samuel Martin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.