rpms/ocaml
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Temporarily disable emacs subpackage on riscv64.

Browse Source
This commit is contained in:
Richard W.M. Jones 2016-11-11 21:48:51 +00:00
parent 2730b0fa32
commit a48061fc04
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ocaml.spec
View File

@ -70,7 +70,9 @@ Patch0007: 0007-Try-fix-for-andi-ori-xori-immediates-1.patch
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: gdbm-devel BuildRequires: gdbm-devel
%ifnarch riscv64
BuildRequires: emacs BuildRequires: emacs
%endif
BuildRequires: gawk BuildRequires: gawk
BuildRequires: perl BuildRequires: perl
BuildRequires: util-linux BuildRequires: util-linux
@ -152,6 +154,7 @@ Provides: ocamldoc
Documentation generator for OCaml. Documentation generator for OCaml.
%ifnarch riscv64
%package emacs %package emacs
Summary: Emacs mode for OCaml Summary: Emacs mode for OCaml
Requires: ocaml = %{version}-%{release} Requires: ocaml = %{version}-%{release}
@ -159,6 +162,7 @@ Requires: emacs(bin)
%description emacs %description emacs
Emacs mode for OCaml. Emacs mode for OCaml.
%endif
%package docs %package docs
@ -220,7 +224,9 @@ $make world
$make opt $make opt
$make opt.opt $make opt.opt
%endif %endif
%ifnarch riscv64
make -C emacs ocamltags make -C emacs ocamltags
%endif
# Currently these tools are supplied by Debian, but are expected # Currently these tools are supplied by Debian, but are expected
# to go upstream at some point. # to go upstream at some point.
@ -251,6 +257,7 @@ make install \
MANDIR=$RPM_BUILD_ROOT%{_mandir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
%ifnarch riscv64
( (
# install emacs files # install emacs files
cd emacs; cd emacs;
@ -259,6 +266,7 @@ perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir} make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir}
) )
%endif
( (
# install info files # install info files
@ -421,10 +429,12 @@ fi
%{_mandir}/man3/* %{_mandir}/man3/*
%ifnarch riscv64
%files emacs %files emacs
%doc emacs/README %doc emacs/README
%{_datadir}/emacs/site-lisp/* %{_datadir}/emacs/site-lisp/*
%{_bindir}/ocamltags %{_bindir}/ocamltags
%endif
%files compiler-libs %files compiler-libs
@ -445,6 +455,7 @@ fi
* Fri Nov 11 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-4 * Fri Nov 11 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-4
- riscv64: Fix intermediate operands. - riscv64: Fix intermediate operands.
(https://github.com/nojb/riscv-ocaml/issues/1) (https://github.com/nojb/riscv-ocaml/issues/1)
- Temporarily disable emacs subpackage on riscv64.
* Wed Nov 09 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-3 * Wed Nov 09 2016 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-3
- s390x: Fix address of caml_raise_exn in native dynlink modules. - s390x: Fix address of caml_raise_exn in native dynlink modules.