From 269c527620899258e74a030db68552da6581e591 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 9 Aug 2017 12:41:19 +0100 Subject: [PATCH] Disable debugsource packages - see comment in spec. --- camlimages-4.2.4-add-g-flag.patch | 11 +++++++++++ ocaml-camlimages.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/camlimages-4.2.4-add-g-flag.patch b/camlimages-4.2.4-add-g-flag.patch index 359b313..623712d 100644 --- a/camlimages-4.2.4-add-g-flag.patch +++ b/camlimages-4.2.4-add-g-flag.patch @@ -9,3 +9,14 @@ # For the development, -warn-error A is turned on if $(file-exists DEV) +--- camlspotter-camlimages-13777ef409e7/OMyMakeroot.old 2017-08-09 12:38:11.026148848 +0100 ++++ camlspotter-camlimages-13777ef409e7/OMyMakeroot 2017-08-09 12:38:20.812149472 +0100 +@@ -133,7 +133,7 @@ + OCamlMkLibC(name, files, ldflags) = + protected.COBJS=$(addsuffix .o, $(files)) + dll$(name).so lib$(name).a: $(COBJS) +- $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS) ++ $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS) + return $(array dll$(name).so, lib$(name).a) + + # If ocamlmklib does not work for you, you can do: diff --git a/ocaml-camlimages.spec b/ocaml-camlimages.spec index a7b096a..ba435aa 100644 --- a/ocaml-camlimages.spec +++ b/ocaml-camlimages.spec @@ -1,3 +1,8 @@ +# XXX This indicates a bug somewhere. We are not passing the -g flag +# through when creating the libraries. However I cannot see exactly +# what is wrong. +%undefine _debugsource_packages + Name: ocaml-camlimages Version: 4.2.4 Release: 1%{?dist} @@ -49,7 +54,7 @@ Includes documentation provided by ocamldoc %patch1 -p1 %build -omake CFLAGS="$RPM_OPT_FLAGS" +omake CFLAGS="$RPM_OPT_FLAGS" --verbose %install # These rules work if the library uses 'ocamlfind install' to install itself.