From 27d2c87d8ee95b311014a383743ad7b8fc89c53a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2019 10:35:01 +0200 Subject: [PATCH] try to fix ubuntu trusty for real --- debian/rules | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index fb78c6be..fb9c179a 100755 --- a/debian/rules +++ b/debian/rules @@ -235,13 +235,6 @@ endif endif endif -OLD_DH_DISTRO := trusty -ifneq (,$(filter $(DISTRO),$(OLD_DH_DISTRO))) -# DH doesn't support the [power ...] in install -# fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory -$(shell sed -e "s|\[\!powerpc \!powerpcspe\] ||g" debian/llvm-X.Y-dev.install.in) -endif - DH_OPTIONS= OCAML_ENABLE= no OCAML_ARCHS := amd64 arm64 armhf i386 ppc64el s390x @@ -290,6 +283,12 @@ preconfigure: # Make install file executable for dh-exec chmod +x debian/llvm-$(LLVM_VERSION)-dev.install + # DH doesn't support the [power ...] in install on Ubuntu trusty + # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory + if test "$(DISTRO)" = "trusty"; then \ + sed -i -e "s|\[\!powerpc \!powerpcspe\] ||g" debian/llvm-$(LLVM_VERSION)-dev.install; \ + fi + # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: