package/gnuradio: use ENABLE_ORC
PATCH 1/2 package/gnuradio: use ENABLE_ORC
Use ENABLE_ORC to explicitly enable or disable ORC
This option is available since version 3.7.4 and
https://github.com/gnuradio/gnuradio/commit/085c35a375468179929b690a0d7f037dc6ef23bf
--- package/gnuradio/gnuradio.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
package/gnuradio/gnuradio.mk +7 -4
@@ -18,10 +18,6 @@ GNURADIO_DEPENDENCIES = \ host-swig \ boost -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -endif - GNURADIO_CONF_OPTS = \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \
@@ -53,6 +49,13 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 endif +ifeq ($(BR2_PACKAGE_ORC),y) +GNURADIO_DEPENDENCIES += orc +GNURADIO_CONF_OPTS += -DENABLE_ORC=ON +else +GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else
Signature · 1 line
2.24.0
PATCH 2/2 package/gnuradio: fix gr-pager option
Since a very long time (at least version 3.5.1 in 2011 and
https://github.com/gnuradio/gnuradio/commit/accb9f2fe8fd8f6a1e114adac5b15304b0e0012d),
gr-pager option is named ENABLE_GR_PAGER, not ENABLE_PAGER
--- package/gnuradio/gnuradio.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/gnuradio/gnuradio.mk +2 -2
@@ -133,9 +133,9 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON +GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON else -GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF +GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
Signature · 1 line
2.24.0
PATCH 1/2 package/gnuradio: use ENABLE_ORC
In reply to Fabrice FontaineFabrice, All,
On 2020-01-04 19:30 +0100, Fabrice Fontaine spake thusly:
Quoted 6 lines
Use
ENABLE_ORCto explicitly enable or disable ORCThis option is available since version 3.7.4 and
https://github.com/gnuradio/gnuradio/commit/085c35a375468179929b690a0d7f037dc6ef23bfSigned-off-by Fabrice Fontaine <[email protected]>
Both applied to master (I just noticed I inverted the order for no good reason, but that has no consequence as the two are orthogonal). Thanks.
Regards,
Yann E. MORIN.
Quoted 40 lines
--- package/gnuradio/gnuradio.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)package/gnuradio/gnuradio.mk +7
-4@@ -18,10 +18,6 @@ GNURADIO_DEPENDENCIES = \ host-swig \ boost -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -endif - GNURADIO_CONF_OPTS = \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \@@ -53,6 +49,13 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 endif +ifeq ($(BR2_PACKAGE_ORC),y) +GNURADIO_DEPENDENCIES += orc +GNURADIO_CONF_OPTS += -DENABLE_ORC=ON +else +GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON elseSignature · 6 lines
2.24.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'