From 1053f13572176c21683bc8af8783f6135513fc54 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Fri, 3 Mar 2017 22:35:06 +0100 Subject: [PATCH] Don't install ocamloptp on non-opt architectures, properly --- debian/patches/0011-fix-nonnative-ocamlopt.patch | 11 ----------- debian/patches/series | 1 - debian/rules | 1 + 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 debian/patches/0011-fix-nonnative-ocamlopt.patch diff --git a/debian/patches/0011-fix-nonnative-ocamlopt.patch b/debian/patches/0011-fix-nonnative-ocamlopt.patch deleted file mode 100644 index ecfb40df..00000000 --- a/debian/patches/0011-fix-nonnative-ocamlopt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/Makefile.shared -+++ b/tools/Makefile.shared -@@ -135,7 +135,7 @@ - arg_helper.cmo clflags.cmo main_args.cmo - - $(call byte_and_opt,ocamlcp,$(ocamlcp_cmos) ocamlcp.cmo,) --$(call byte_and_opt,ocamloptp,$(ocamlcp_cmos) ocamloptp.cmo,) -+$(call byte_and_opt,ocamloptp,$(ocamloptp_cmos) ocamloptp.cmo,) - - opt:: profiling.cmx - diff --git a/debian/patches/series b/debian/patches/series index ca0d3bc5..c7d67535 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch 0009-Skip-native-tests.patch 0010-arm-default-PIC.patch -0011-fix-nonnative-ocamlopt.patch diff --git a/debian/rules b/debian/rules index 842ac388..e9fc69e5 100755 --- a/debian/rules +++ b/debian/rules @@ -210,6 +210,7 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),no) rm -f \ $(INSTDIR)/share/man/man1/ocamloptp.1 \ $(INSTDIR)/share/man/man1/ocamlopt.1 \ + $(INSTDIR)/bin/ocamloptp.* \ $(INSTDIR)/bin/ocamloptp endif # Dispatch files with dh_install -- 2.30.2