rpms/brltty
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Create stublibs directory for OCaml, else install fails.

Browse Source 
Unset MAKEFLAGS so that MAKEFLAGS=-j<N> does not break local builds.
This commit is contained in:
Richard W.M. Jones 2013-09-14 15:18:00 +01:00
parent 2a911823e2
commit 2d62c19390
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
brltty.spec
View File

@ -189,6 +189,9 @@ cp -a . %{py3dir}
%endif %endif
%build %build
# If MAKEFLAGS=-jN is set it would break local builds.
unset MAKEFLAGS
# Add the openjdk include directories to CPPFLAGS # Add the openjdk include directories to CPPFLAGS
for i in -I/usr/lib/jvm/java/include{,/linux}; do for i in -I/usr/lib/jvm/java/include{,/linux}; do
java_inc="$java_inc $i" java_inc="$java_inc $i"
@ -247,6 +250,10 @@ while read file; do
done done
%install %install
%if 0%{?with_ocaml}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
%endif
# Python 2 # Python 2
make install JAVA_JAR_DIR=%{_jnidir} \ make install JAVA_JAR_DIR=%{_jnidir} \
JAVA_JNI_DIR=%{_libdir}/brltty \ JAVA_JNI_DIR=%{_libdir}/brltty \
@ -364,6 +371,8 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
%changelog %changelog
* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 4.5-8 * Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 4.5-8
- Rebuild for OCaml 4.01.0. - Rebuild for OCaml 4.01.0.
- Create stublibs directory for OCaml, else install fails.
- Unset MAKEFLAGS so that MAKEFLAGS=-j<N> does not break local builds.
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5-7 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild