osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email ) Change subject: buildsystem: remove ttcn3_compiler workaround ...................................................................... buildsystem: remove ttcn3_compiler workaround The related debian bug has been fixed in 2018, so remove the workaround. I've also verified that the binary is called "compiler" in Arch Linux (as some developers are on Arch). Change-Id: Ia50aa3caffeaa85eefba10695096aa23dcb69c93 --- M _buildsystem/regen_makefile.inc.sh 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/_buildsystem/regen_makefile.inc.sh b/_buildsystem/regen_makefile.inc.sh index 573231f..31dd491 100644 --- a/_buildsystem/regen_makefile.inc.sh +++ b/_buildsystem/regen_makefile.inc.sh @@ -14,14 +14,7 @@ # limitations under the License. -# Wrapper around the TITAN make file generator to work in Debian. -# -# TITAN has a makefile generator, but somehow Debian seems to install -# the binaries to different paths without patching the make file -# generator, leading in inconsistent non-working Makefiles. -# -# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. -# +# Wrapper around the TITAN make file generator if [ -z "$NAME" ]; then echo "ERROR: NAME is not set!" @@ -70,7 +63,6 @@ else sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile fi -sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile if [ "x$USE_CCACHE" = "x1" ]; then # enable ccache -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40028?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia50aa3caffeaa85eefba10695096aa23dcb69c93 Gerrit-Change-Number: 40028 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>