diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-10-04 21:06:24 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-10-04 21:09:11 +0200 |
| commit | 18ed23cda553b25b1f1dd2764720cfc3f2b88b73 (patch) | |
| tree | 2982761388660cfc645e2cf1b37493c0cfd928be | |
| parent | 847a77e32fada86da0e647179f7b69c23a3304eb (diff) | |
regen-makefile.sh: Put libraries in LINUX_LIBS, not LDFLAGS
Additional libraries to be linked should be in LINUX_LIBS (appended at
the end of the linker command), not part of LDFLAGS (prepended to
the beginning of the linker command).
On binutils 2.35.1 / Debian unstable, without this patch, I get
/usr/bin/ld: IPL4asp_PT.so: undefined reference to `sctp_bindx'
/usr/bin/ld: IPL4asp_PT.so: undefined reference to `sctp_connectx'
which is resolved by this patch
Change-Id: I8a339076f445e3c650e407ae982c7c2dc4a760b2
| -rwxr-xr-x | mme/regen_makefile.sh | 2 | ||||
| -rwxr-xr-x | msc/regen_makefile.sh | 2 | ||||
| -rwxr-xr-x | regen-makefile.sh | 3 | ||||
| -rwxr-xr-x | sgsn/regen_makefile.sh | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 2d3bf591..cb047778 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -6,4 +6,4 @@ export CPPFLAGS_TTCN3="" ../regen-makefile.sh MME_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode -lgnutls/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 9278530e..6ee3ef5e 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -6,4 +6,4 @@ export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION ../regen-makefile.sh MSC_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/regen-makefile.sh b/regen-makefile.sh index f6e9538e..086c1247 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -45,7 +45,8 @@ ttcn3_makefilegen -g -p -l -U 5 -f $* TITAN_VERSION=$(ttcn3_makefilegen -v 2>&1 |grep "Product number" |cut --delimiter="/" -f 2-| sed -e "s/[A-Z ]//g") sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile -sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan -lsctp /' Makefile +sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile +sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile #sed -i -e 's/TTCN3_LIB = ttcn3-parallel/TTCN3_LIB = ttcn3/' Makefile # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 1d1411ec..55ff26fe 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -6,4 +6,4 @@ export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DIST ../regen-makefile.sh SGSN_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile |