Create stublibs directory for OCaml, else install fails.
Unset MAKEFLAGS so that MAKEFLAGS=-j<N> does not break local builds.
This commit is contained in:
parent
2a911823e2
commit
2d62c19390
@ -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 <rjones@redhat.com> - 4.5-8
|
||||
- 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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user