package/gnuradio: use ENABLE_ORC
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sat, 4 Jan 2020 18:30:58 +0000 (19:30 +0100)
committerYann E. MORIN <yann.morin.1998@free.fr>
Thu, 9 Jan 2020 17:21:46 +0000 (18:21 +0100)
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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/gnuradio/gnuradio.mk

index f6c3def1e49634d5bc4cf120597017583a8227f1..7ee44f26aefb3ca6b6e8af323494587ddd8f3587 100644 (file)
@@ -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