瀏覽代碼

package/gr-osmosdr: drop BR2_PACKAGE_GR_OSMOSDR_PYTHON

Drop BR2_PACKAGE_GR_OSMOSDR_PYTHON as disabling python will raise the
following build failure if BR2_PACKAGE_GNURADIO_PYTHON is set since bump
of gnuradio to version 3.10.4.0 in commit
e37c110bead8b7b35cd97915673fa785ccb39f2d and
https://github.com/gnuradio/gnuradio/commit/51d3ad973292763a6fc0cf8e971faa3cf89029e9:

CMake Error at lib/CMakeLists.txt:51 (add_library):
  Target "gnuradio-osmosdr" links to target "Python::Module" but the target
  was not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?

No entry in Config.in.legacy is needed as python support in gr-osmosdr
will now automatically be enabled if BR2_PACKAGE_GNURADIO_PYTHON is set

Fixes:
 - http://autobuild.buildroot.org/results/49e9f7bf8bfc7008688c1a3bc3744b7d3be3ce18

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 2 年之前
父節點
當前提交
f931ac2819
共有 2 個文件被更改,包括 1 次插入8 次删除
  1. 0 7
      package/gr-osmosdr/Config.in
  2. 1 1
      package/gr-osmosdr/gr-osmosdr.mk

+ 0 - 7
package/gr-osmosdr/Config.in

@@ -11,13 +11,6 @@ config BR2_PACKAGE_GR_OSMOSDR
 
 if BR2_PACKAGE_GR_OSMOSDR
 
-config BR2_PACKAGE_GR_OSMOSDR_PYTHON
-	bool "python support"
-	depends on BR2_PACKAGE_GNURADIO_PYTHON
-	depends on BR2_PACKAGE_PYTHON3
-	help
-	  Enable Python support
-
 config BR2_PACKAGE_GR_OSMOSDR_IQFILE
 	bool "IQ File Source support"
 	help

+ 1 - 1
package/gr-osmosdr/gr-osmosdr.mk

@@ -22,7 +22,7 @@ GR_OSMOSDR_CONF_OPTS = \
 # compile time.
 GR_OSMOSDR_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y)
+ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y)
 GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON
 GR_OSMOSDR_DEPENDENCIES += python3
 else