Add -textrel patch to fix FTBFS on i386.

This commit is contained in:
Jerry James 2021-04-13 16:29:21 -06:00
parent 485eed3e57
commit 5e9d9b8a2d
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,12 @@
--- a/tests/test-dirs/src-documentation.t/run.t 2021-04-13 02:53:39.000000000 -0600
+++ b/tests/test-dirs/src-documentation.t/run.t 2021-04-13 16:25:54.315494520 -0600
@@ -43,6 +43,9 @@ documentation for the non-last defined v
" List reversal. "
$ dune build --root=. ./doc.exe
+ ocamlopt doc.exe
+ /usr/bin/ld: .doc.eobjs/native/doc.o: warning: relocation in read-only section `.text'
+ /usr/bin/ld: warning: creating DT_TEXTREL in a PIE
$ cat >.merlin <<EOF
> B _build/default/.doc.eobjs/byte
> S .

View File

@ -26,6 +26,9 @@ Source0: https://github.com/ocaml/%{srcname}/releases/download/v%{version
Patch0: %{name}-test-lib64.patch
# Fix various issues in the Emacs interface
Patch1: %{name}-emacs.patch
# On i386, we get extra output about text relocations
# See https://github.com/ocaml/ocaml/issues/9800
Patch2: %{name}-textrel.patch
BuildRequires: emacs
BuildRequires: emacs-auto-complete
@ -93,7 +96,12 @@ Requires: vim-filesystem
This package contains the Vim interface to merlin.
%prep
%autosetup -n %{srcname}-v%{version}-%{ocamlver} -p1
%autosetup -n %{srcname}-v%{version}-%{ocamlver} -N
%patch0 -p1
%patch1 -p1
%ifarch %{ix86}
%patch2 -p1
%endif
%build
dune build %{_smp_mflags}
@ -152,6 +160,7 @@ dune runtest
- Version 4.2
- Drop upstreamed -iedit patch
- Add -emacs patch to fix various Emacs issues
- Add -textrel patch to fix FTBFS on i386
* Fri Mar 26 2021 Jerry James <loganjerry@gmail.com> - 4.1-2
- Fix tests on 64-bit systems with the -test-lib64 patch