LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3491 Commits
1 Branch
46 MiB
Tree: b59187dc62
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'b59187dc62'
${ noResults }
openwrt-packages-dist/net/tinc/patches/100-musl-compat.patch

11 lines
192 B
Raw Normal View History

tinc: fix musl compatibility Let configure include `sys/if_tun.h` when testing for `netinet/if_ether.h` to detect the Kernel/libc header conflict on musl. After this patch, configure will correctly detect `netinet/if_ether.h` as unusable and the subsequent compilation will not attempt to use it. Fixes the following compatibility error: In file included from .../staging_dir/toolchain-mips_mips32_gcc-4.8-linaro_musl-1.1.9/include/linux/if_tun.h:20:0, from linux/device.c:24: .../staging_dir/toolchain-mips_mips32_gcc-4.8-linaro_musl-1.1.9/include/linux/if_ether.h:137:8: error: redefinition of 'struct ethhdr' struct ethhdr { ^ In file included from .../staging_dir/toolchain-mips_mips32_gcc-4.8-linaro_musl-1.1.9/include/net/ethernet.h:10:0, from linux/../have.h:180, from linux/../system.h:26, from linux/device.c:21: .../staging_dir/toolchain-mips_mips32_gcc-4.8-linaro_musl-1.1.9/include/netinet/if_ether.h:96:8: note: originally defined here struct ethhdr { ^ make[5]: *** [linux/device.o] Error 1 Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
10 years ago
​
​
​
​
​
​
​
​
​
​
 
  1. --- a/src/have.h

  2. +++ b/src/have.h

  3. @@ -196,4 +196,8 @@

  4.  #include <netinet/if_ether.h>
  5.  #endif
  6.  
  7. +#ifdef HAVE_LINUX_IF_TUN_H

  8. +#include <linux/if_tun.h>

  9. +#endif

  10. +

  11.  #endif /* __TINC_SYSTEM_H__ */