浏览代码

package/olsr: enable back on musl with headers >= 4.15

olsr has been disabled on musl three years ago by commit
4bca88c839e54a9140c06010666f5e034127b8b1.

Comments in https://github.com/OLSR/olsrd/issues/6 suggest that the
issue was due to olsr mixing kernel and userspace headers. This issue is
still open.

However, nowadays olsr builds fine on musl under those two conditions:
- musl >= 1.1.16 (i.e. with
  http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258)
- kernels >= 4.15 (i.e. with
  https://github.com/torvalds/linux/commit/c0bace798436bca0fdc221ff61143f1376a9c3de)

So enable it back on musl with kernels >= 4.15.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 5 年之前
父节点
当前提交
8033e5b87d
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7 5
      package/olsr/Config.in

+ 7 - 5
package/olsr/Config.in

@@ -3,9 +3,8 @@ config BR2_PACKAGE_OLSR
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
-	# doesn't build with musl,
 	# https://github.com/OLSR/olsrd/issues/6
 	# https://github.com/OLSR/olsrd/issues/6
-	depends on !BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	help
 	help
 	  The Optimized Link State Routing protocol (OLSR) is a
 	  The Optimized Link State Routing protocol (OLSR) is a
 	  routing protocol that is optimised for mobile ad-hoc
 	  routing protocol that is optimised for mobile ad-hoc
@@ -16,7 +15,10 @@ config BR2_PACKAGE_OLSR
 
 
 	  http://www.olsr.org/
 	  http://www.olsr.org/
 
 
-comment "olsr needs a uClibc or glibc toolchain w/ threads, dynamic library"
+comment "olsr needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
-		BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+
+comment "olsr needs a musl toolchain w/ headers >= 4.15"
+	depends on BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15