[PATCH] osmo-ttcn3-hacks[master]: Avoid gcc version check

[Max]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/5313

to look at the new patch set (#2).

Avoid gcc version check

By default the build fails on Debian due to gcc version check in
/usr/include/titan/cversion.h - instead of asking users to manually
change this file let's add workaround to our makefile fixer which
disables this check automatically.

The corresponding Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816

Change-Id: I71c765d5d8e182a198e2c5d2886ebce3b86e6328
---
M regen-makefile.sh
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/5313/2

diff --git a/regen-makefile.sh b/regen-makefile.sh
index 1814699..f757fa3 100755
--- a/regen-makefile.sh
+++ b/regen-makefile.sh
@@ -8,12 +8,16 @@
 #
 # 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
+#
 
 ttcn3_makefilegen -l -f $*
 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/TTCN3_LIB = ttcn3-parallel/TTCN3_LIB = ttcn3/' Makefile
-sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
+
+# The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue,
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details
+sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
 sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile

-- 
To view, visit https://gerrit.osmocom.org/5313
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I71c765d5d8e182a198e2c5d2886ebce3b86e6328
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>