From cf9159da50fc4209e9c1968599d342260cb5cb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Dec 2018 21:51:13 +0100 Subject: [PATCH] Improved CFLAGS handling when building Ocaml bindings --- brltty-5.6-ocaml-add-flags.patch | 5 +++-- brltty.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/brltty-5.6-ocaml-add-flags.patch b/brltty-5.6-ocaml-add-flags.patch index 0d0e53d..5794380 100644 --- a/brltty-5.6-ocaml-add-flags.patch +++ b/brltty-5.6-ocaml-add-flags.patch @@ -1,5 +1,5 @@ diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in -index 47f7201..7d56ef1 100644 +index 47f7201..a97f55c 100644 --- a/Bindings/OCaml/Makefile.in +++ b/Bindings/OCaml/Makefile.in @@ -55,25 +55,25 @@ OCAML_FILES = $(OCAML_MISC) $(OCAML_CLIBS) $(OCAML_BCLIB) $(OCAML_NCLIB) @@ -26,7 +26,8 @@ index 47f7201..7d56ef1 100644 + $(OCAMLC) -ccopt "$(CFLAGS)" -o $@ -c brlapi.ml brlapi.cmx: brlapi.ml brlapi.cmi - $(OCAMLOPT) -o $@ -c brlapi.cmx brlapi.ml +- $(OCAMLOPT) -o $@ -c brlapi.cmx brlapi.ml ++ $(OCAMLOPT) -ccopt "$(CFLAGS)" -o $@ -c brlapi.cmx brlapi.ml brlapi_stubs.$O: $(SRC_DIR)/brlapi_stubs.c - $(OCAMLC) -I $(BLD_TOP)$(PGM_DIR) -I $(SRC_TOP)$(PGM_DIR) -c $(SRC_DIR)/brlapi_stubs.c diff --git a/brltty.spec b/brltty.spec index 7d1e14d..cf3497e 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 28%{?dist} +Release: 29%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -534,6 +534,9 @@ fi %{_prefix}/lib/dracut/modules.d/99brltty/ %changelog +* Wed Dec 5 2018 Jaroslav Škarvada - 5.6-29 +- Improved CFLAGS handling when building Ocaml bindings + * Wed Dec 5 2018 Jaroslav Škarvada - 5.6-28 - Built OCaml bindings with distribution CFLAGS and consolidated patches - Fixed Cython build requires