diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-10-11 18:04:43 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-10-11 18:21:25 +0200 |
| commit | 1cdbf1b51e53f5736ce2169feb33a3068a5bc141 (patch) | |
| tree | 7c64275e72e0c86981803ea68b6ae5bb746538ca | |
| parent | 6d916910a3764a7934c96ab340c1b6344c707c7b (diff) | |
regen-makefile.sh: remove titan < 6.5.1 code path
Prepare to make osmo-ttcn3-hacks.git work with eclipse-titan 8.0.0,
where "ttcn3_makefilegen -v" does not have a "Product number" anymore.
Fix for:
../regen-makefile.sh: 54: ../regen-makefile.sh: arithmetic expression: expecting primary: " >= 65"
Related: OS#5252
Related: If9fef29ce243be112d3735f0236335197f8f140f
Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d
| -rwxr-xr-x | regen-makefile.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/regen-makefile.sh b/regen-makefile.sh index 086c1247..b53129f4 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -24,9 +24,6 @@ # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. # -# The regexes below patch the generated Makefile to work on Debian 9 and -# unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 -# test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; } @@ -42,8 +39,6 @@ fi 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/' Makefile sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile @@ -51,11 +46,7 @@ sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -if [ $(($TITAN_VERSION >= 65)) = 1 ]; then - sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile -else - sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile -fi +sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile #remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs sed -i -e 's/-Wall//' Makefile |