This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... 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 --- M regen-makefile.sh 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/25745/1 diff --git a/regen-makefile.sh b/regen-makefile.sh index 086c124..b53129f 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 @@ 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 @@ # 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 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211011/2e4d85d2/attachment.htm>