deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
olsr has been disabled on musl three years ago by commit
4bca88c839.

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
  c0bace7984)

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>
This commit is contained in:
Fabrice Fontaine 2020-01-11 23:08:24 +01:00 committed by Thomas Petazzoni
parent e63c09c0f3
commit 8033e5b87d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/olsr/Config.in
View file

@ -3,9 +3,8 @@ config BR2_PACKAGE_OLSR
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS
# doesn't build with musl,
# 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
The Optimized Link State Routing protocol (OLSR) is a
routing protocol that is optimised for mobile ad-hoc
@ -16,7 +15,10 @@ config BR2_PACKAGE_OLSR
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_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