From 2d62c193909b6fcb9c3f2c95e2aec584895b0c05 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 14 Sep 2013 15:18:00 +0100 Subject: [PATCH] Create stublibs directory for OCaml, else install fails. Unset MAKEFLAGS so that MAKEFLAGS=-j does not break local builds. --- brltty.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/brltty.spec b/brltty.spec index 699627a..0c196ab 100644 --- a/brltty.spec +++ b/brltty.spec @@ -189,6 +189,9 @@ cp -a . %{py3dir} %endif %build +# If MAKEFLAGS=-jN is set it would break local builds. +unset MAKEFLAGS + # Add the openjdk include directories to CPPFLAGS for i in -I/usr/lib/jvm/java/include{,/linux}; do java_inc="$java_inc $i" @@ -247,6 +250,10 @@ while read file; do done %install +%if 0%{?with_ocaml} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs +%endif + # Python 2 make install JAVA_JAR_DIR=%{_jnidir} \ JAVA_JNI_DIR=%{_libdir}/brltty \ @@ -364,6 +371,8 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a %changelog * Sat Sep 14 2013 Richard W.M. Jones - 4.5-8 - Rebuild for OCaml 4.01.0. +- Create stublibs directory for OCaml, else install fails. +- Unset MAKEFLAGS so that MAKEFLAGS=-j does not break local builds. * Sat Aug 03 2013 Fedora Release Engineering - 4.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild