* [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory
@ 2015-02-25 19:18 Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-25 19:18 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>
---
Changes v1 -> v2:
* Allow to overload $(2)_BUILDDIR instead of adding a new variable and test
---
package/pkg-cmake.mk | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index eacd641..f3bd080 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR = $$($(2)_SRCDIR)
+$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
#
# Configure step. Only define it if not already defined by the package
@@ -69,7 +69,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 +94,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] 10+ messages in thread
* [Buildroot] [PATCH v2 2/4] python-cheetah: add host-package support
2015-02-25 19:18 [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
@ 2015-02-25 19:18 ` Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 3/4] python-markdown: " Gwenhael Goavec-Merou
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-25 19:18 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] 10+ messages in thread
* [Buildroot] [PATCH v2 3/4] python-markdown: add host-package support
2015-02-25 19:18 [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
@ 2015-02-25 19:18 ` Gwenhael Goavec-Merou
2015-03-02 21:59 ` Samuel Martin
2015-02-25 19:18 ` [Buildroot] [PATCH v2 4/4 GNURadio: new package Gwenhael Goavec-Merou
2015-03-02 21:55 ` [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Samuel Martin
3 siblings, 1 reply; 10+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-25 19:18 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] 10+ messages in thread
* [Buildroot] [PATCH v2 4/4 GNURadio: new package
2015-02-25 19:18 [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 3/4] python-markdown: " Gwenhael Goavec-Merou
@ 2015-02-25 19:18 ` Gwenhael Goavec-Merou
2015-03-02 22:21 ` Samuel Martin
2015-03-02 21:55 ` [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Samuel Martin
3 siblings, 1 reply; 10+ messages in thread
From: Gwenhael Goavec-Merou @ 2015-02-25 19:18 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>
---
Changes v1 -> v2:
* overload _BUILDDIR variable to specify build directory
---
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..ba9ba13
--- /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_BUILDDIR = $(GNURADIO_SRCDIR)/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] 10+ messages in thread
* [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory
2015-02-25 19:18 [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
` (2 preceding siblings ...)
2015-02-25 19:18 ` [Buildroot] [PATCH v2 4/4 GNURadio: new package Gwenhael Goavec-Merou
@ 2015-03-02 21:55 ` Samuel Martin
2015-03-03 10:00 ` gwenhael.goavec
3 siblings, 1 reply; 10+ messages in thread
From: Samuel Martin @ 2015-03-02 21:55 UTC (permalink / raw)
To: buildroot
Hi Gwenhael,
On Wed, Feb 25, 2015 at 8:18 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>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
It would be good to update the cmake-package section of the manual as well. ;-)
This doc should mention that the user has to set the build location
path for the target package, but also for the host package if any.
I.e.:
FOO_BUILDDIR = $(FOO_SRCDIR)/.build
HOST_FOO_BUILDDIR = $(HOST_FOO_SRCDIR)/.build
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2 3/4] python-markdown: add host-package support
2015-02-25 19:18 ` [Buildroot] [PATCH v2 3/4] python-markdown: " Gwenhael Goavec-Merou
@ 2015-03-02 21:59 ` Samuel Martin
0 siblings, 0 replies; 10+ messages in thread
From: Samuel Martin @ 2015-03-02 21:59 UTC (permalink / raw)
To: buildroot
Hi Gwenhael,
On Wed, Feb 25, 2015 at 8:18 PM, Gwenhael Goavec-Merou
<gwenj@trabucayre.com> wrote:
> 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
>
The patch order looks odd... the patch 2/4 uses what is introduced by
the patch 3/4.
It is not a big deal, just a bit confusing at first. ;-)
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2 4/4 GNURadio: new package
2015-02-25 19:18 ` [Buildroot] [PATCH v2 4/4 GNURadio: new package Gwenhael Goavec-Merou
@ 2015-03-02 22:21 ` Samuel Martin
2015-03-03 11:01 ` gwenhael.goavec
0 siblings, 1 reply; 10+ messages in thread
From: Samuel Martin @ 2015-03-02 22:21 UTC (permalink / raw)
To: buildroot
Hi Gwenhael,
On Wed, Feb 25, 2015 at 8:18 PM, Gwenhael Goavec-Merou
<gwenj@trabucayre.com> wrote:
> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
>
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> ---
> Changes v1 -> v2:
> * overload _BUILDDIR variable to specify build directory
> ---
> 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
I guess boost-python is used to do the python binding, so it is not
needed if BR2_PACKAGE_GNURADIO_PYTHON is disabled, right?
Unless it is volk that pulls it?
> + select BR2_PACKAGE_BOOST_SYSTEM
> + select BR2_PACKAGE_BOOST_TEST
For what is boost-test used?
In BR we disable test build, and you explicitly disabled it in the *.mk file.
> + select BR2_PACKAGE_BOOST_THREAD
> + select BR2_PACKAGE_PYTHON
ditto (same comment as boost-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)
Move the comment above "config BR2_PACKAGE_GNURADIO", otherwise the
indentation of the below sub-options will be lost in menuconfig.
> +
> +
> +if BR2_PACKAGE_GNURADIO
> +
> +config BR2_PACKAGE_GNURADIO_BLOCKS
> + bool "gnuradio-blocks"
> +
> +config BR2_PACKAGE_GNURADIO_PYTHON
> + bool "gnuradio-python"
If python and boost-python are only needed when
BR2_PACKAGE_GNURADIO_PYTHON is enable, BR2_PACKAGE_GNURADIO should
select the correct deps and the *.mk file should reflect the same
logic.
> +
> +endif
> diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
> new file mode 100644
> index 0000000..ba9ba13
> --- /dev/null
> +++ b/package/gnuradio/gnuradio.mk
> @@ -0,0 +1,24 @@
> +################################################################################
> +#
> +# gnuradio
> +#
> +################################################################################
> +
> +GNURADIO_VERSION = 2bb2b31476cb33e9c1bbb196fffba3a857b4f75a
> +GNURADIO_SITE = git://git.gnuradio.org/gnuradio
Any reason to use the git instead of a released tarball?
> +GNURADIO_LICENSE = GPLv3+
> +GNURADIO_LICENSE_FILES = COPYING
> +
> +GNURADIO_BUILDDIR = $(GNURADIO_SRCDIR)/build
Just add a comment telling that gnuradio prevent from in-source-tree build.
> +#needed for volk compile
> +GNURADIO_DEPENDENCIES += host-python-cheetah
> +GNURADIO_DEPENDENCIES += host-swig host-boost boost
> +GNURADIO_INSTALL_STAGING = YES
Why is this needed?
> +
> +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
>
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory
2015-03-03 10:00 ` gwenhael.goavec
@ 2015-03-03 10:00 ` Samuel Martin
0 siblings, 0 replies; 10+ messages in thread
From: Samuel Martin @ 2015-03-03 10:00 UTC (permalink / raw)
To: buildroot
On Tue, Mar 3, 2015 at 11:00 AM, gwenhael.goavec <gwenj@trabucayre.com> wrote:
> Hi Samuel,
>
> On Mon, 2 Mar 2015 22:55:11 +0100
> Samuel Martin <s.martin49@gmail.com> wrote:
>
>> Hi Gwenhael,
>>
>> On Wed, Feb 25, 2015 at 8:18 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>
>>
>> Tested-by: Samuel Martin <s.martin49@gmail.com>
>> Acked-by: Samuel Martin <s.martin49@gmail.com>
>>
>> It would be good to update the cmake-package section of the manual as well. ;-)
>>
>> This doc should mention that the user has to set the build location
>> path for the target package, but also for the host package if any.
>> I.e.:
>> FOO_BUILDDIR = $(FOO_SRCDIR)/.build
>> HOST_FOO_BUILDDIR = $(HOST_FOO_SRCDIR)/.build
>>
> True. This update needs to be provided by a new version of this series of patch
> or a new patch ?
A follow-up patch is enough to me ;)
>>
>> Regards,
>>
>> --
>> Samuel
>
> Thank for review and test.
>
> Regards
>
> Gwen
Cheers,
--
Samuel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory
2015-03-02 21:55 ` [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Samuel Martin
@ 2015-03-03 10:00 ` gwenhael.goavec
2015-03-03 10:00 ` Samuel Martin
0 siblings, 1 reply; 10+ messages in thread
From: gwenhael.goavec @ 2015-03-03 10:00 UTC (permalink / raw)
To: buildroot
Hi Samuel,
On Mon, 2 Mar 2015 22:55:11 +0100
Samuel Martin <s.martin49@gmail.com> wrote:
> Hi Gwenhael,
>
> On Wed, Feb 25, 2015 at 8:18 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>
>
> Tested-by: Samuel Martin <s.martin49@gmail.com>
> Acked-by: Samuel Martin <s.martin49@gmail.com>
>
> It would be good to update the cmake-package section of the manual as well. ;-)
>
> This doc should mention that the user has to set the build location
> path for the target package, but also for the host package if any.
> I.e.:
> FOO_BUILDDIR = $(FOO_SRCDIR)/.build
> HOST_FOO_BUILDDIR = $(HOST_FOO_SRCDIR)/.build
>
True. This update needs to be provided by a new version of this series of patch
or a new patch ?
>
> Regards,
>
> --
> Samuel
Thank for review and test.
Regards
Gwen
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2 4/4 GNURadio: new package
2015-03-02 22:21 ` Samuel Martin
@ 2015-03-03 11:01 ` gwenhael.goavec
0 siblings, 0 replies; 10+ messages in thread
From: gwenhael.goavec @ 2015-03-03 11:01 UTC (permalink / raw)
To: buildroot
On Mon, 2 Mar 2015 23:21:01 +0100
Samuel Martin <s.martin49@gmail.com> wrote:
> Hi Gwenhael,
>
> On Wed, Feb 25, 2015 at 8:18 PM, Gwenhael Goavec-Merou
> <gwenj@trabucayre.com> wrote:
> > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> >
> > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> > ---
> > Changes v1 -> v2:
> > * overload _BUILDDIR variable to specify build directory
> > ---
> > 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
> I guess boost-python is used to do the python binding, so it is not
> needed if BR2_PACKAGE_GNURADIO_PYTHON is disabled, right?
> Unless it is volk that pulls it?
>
The boost detection done by GNUradio is quite stupid. If at least one boost
option is not available, it's equal to have nothing about boost...
>
> > + select BR2_PACKAGE_BOOST_SYSTEM
> > + select BR2_PACKAGE_BOOST_TEST
> For what is boost-test used?
> In BR we disable test build, and you explicitly disabled it in the *.mk file.
>
This is exactly the same thing ... But I think a patch to suppress test
dependencies may be a good approach ...
>
> > + select BR2_PACKAGE_BOOST_THREAD
> > + select BR2_PACKAGE_PYTHON
> ditto (same comment as boost-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)
> Move the comment above "config BR2_PACKAGE_GNURADIO", otherwise the
> indentation of the below sub-options will be lost in menuconfig.
>
Done. Next version of these patchs :)
> > +
> > +
> > +if BR2_PACKAGE_GNURADIO
> > +
> > +config BR2_PACKAGE_GNURADIO_BLOCKS
> > + bool "gnuradio-blocks"
> > +
> > +config BR2_PACKAGE_GNURADIO_PYTHON
> > + bool "gnuradio-python"
> If python and boost-python are only needed when
> BR2_PACKAGE_GNURADIO_PYTHON is enable, BR2_PACKAGE_GNURADIO should
> select the correct deps and the *.mk file should reflect the same
> logic.
>
Due to the problem with boost detection these to options have an impact only on
gnuradio build and no to on dependencies...
>
> > +
> > +endif
> > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
> > new file mode 100644
> > index 0000000..ba9ba13
> > --- /dev/null
> > +++ b/package/gnuradio/gnuradio.mk
> > @@ -0,0 +1,24 @@
> > +################################################################################
> > +#
> > +# gnuradio
> > +#
> > +################################################################################
> > +
> > +GNURADIO_VERSION = 2bb2b31476cb33e9c1bbb196fffba3a857b4f75a
> > +GNURADIO_SITE = git://git.gnuradio.org/gnuradio
> Any reason to use the git instead of a released tarball?
>
> > +GNURADIO_LICENSE = GPLv3+
> > +GNURADIO_LICENSE_FILES = COPYING
> > +
> > +GNURADIO_BUILDDIR = $(GNURADIO_SRCDIR)/build
> Just add a comment telling that gnuradio prevent from in-source-tree build.
>
Done
>
> > +#needed for volk compile
> > +GNURADIO_DEPENDENCIES += host-python-cheetah
> > +GNURADIO_DEPENDENCIES += host-swig host-boost boost
> > +GNURADIO_INSTALL_STAGING = YES
> Why is this needed?
>
It is possible to wish compile ''out-of-gnuradio'' blocks by hand.
>
> > +
> > +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
> >
>
> Regards,
>
> --
> Samuel
Regards,
Gwen
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-03-03 11:01 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-25 19:18 [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 2/4] python-cheetah: add host-package support Gwenhael Goavec-Merou
2015-02-25 19:18 ` [Buildroot] [PATCH v2 3/4] python-markdown: " Gwenhael Goavec-Merou
2015-03-02 21:59 ` Samuel Martin
2015-02-25 19:18 ` [Buildroot] [PATCH v2 4/4 GNURadio: new package Gwenhael Goavec-Merou
2015-03-02 22:21 ` Samuel Martin
2015-03-03 11:01 ` gwenhael.goavec
2015-03-02 21:55 ` [Buildroot] [PATCH v2 1/4] pkg-cmake: allow to build package in a subdirectory Samuel Martin
2015-03-03 10:00 ` gwenhael.goavec
2015-03-03 10:00 ` 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.