[openwrt/openwrt] iproute2: m_xt.so depends on dynsyms.list

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 27 11:49:57 PDT 2021


nbd pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/f441be3921c769b732f0148f005d4f1bbace0508

commit f441be3921c769b732f0148f005d4f1bbace0508
Author: Roman Yeryomin <roman at advem.lv>
AuthorDate: Fri Sep 3 17:31:11 2021 +0300

    iproute2: m_xt.so depends on dynsyms.list
    
    When doing parallel build on a fast machine with bottleneck in i/o,
    m_xt.so may start linking faster than dynsyms.list gets populated,
    resulting in error:
    
    ld:dynsyms.list:0: syntax error in dynamic list
    
    Fix this by adding dynsyms.list as make dependency to m_xt.so
    Described also here:
    https://bugs.openwrt.org/index.php?do=details&task_id=3353
    
    Change from v1:
    - add dynsysms.list dependancy only when shared libs are enabled
    
    Signed-off-by: Roman Yeryomin <roman at advem.lv>
    Fixes: FS#3353
    (cherry-picked from commit edd53df16843a0a6380920ed17b88bfe7d26d71b)
---
 package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
index da961a183b..c3892e5a0e 100644
--- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
+++ b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
@@ -26,13 +26,14 @@
  
  q_atm.so: q_atm.c
  	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
-@@ -205,4 +206,15 @@ static-syms.h: $(wildcard *.c)
+@@ -205,4 +206,16 @@ static-syms.h: $(wildcard *.c)
  		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
  	done > $@
  
 +else
 +
 +tc: dynsyms.list
++m_xt.so: dynsyms.list
 +dynsyms.list: $(wildcard *.c)
 +	files="$(filter-out $(patsubst %.so,%.c,$(TCSO)), $^)" ; \
 +	echo "{" > $@ ; \



More information about the lede-commits mailing list