pool/ocaml-cppo
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 672630 from home:onthewings:branches:devel:languages:ocaml

Browse Source 
Remove ocaml-cppo-1.6.1-install-args.patch and directly call dune in the install section.

OBS-URL: https://build.opensuse.org/request/show/672630
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=42
This commit is contained in:
Olaf Hering 2019-02-08 09:04:47 +00:00 committed by Git OBS Bridge
parent 16dd8e41d9
commit 07cfc11f6b
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ocaml-cppo-1.6.1-install-args.patch
View File

@ -1,12 +0,0 @@
diff -up ocaml-cppo-1.6.1/Makefile.orig ocaml-cppo-1.6.1/Makefile
--- ocaml-cppo-1.6.1/Makefile.orig 2018-01-31 23:28:37.944255913 +0100
+++ ocaml-cppo-1.6.1/Makefile 2018-01-31 23:28:49.284256383 +0100
@@ -5,7 +5,7 @@ test:
@jbuilder runtest
install:
- @jbuilder install
+ @jbuilder install $(INSTALL_ARGS)
uninstall:
@jbuilder uninstall

6
ocaml-cppo.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 8 01:35:59 UTC 2019 - andy@onthewings.net
- Remove ocaml-cppo-1.6.1-install-args.patch and directly call dune
in the install section.
-------------------------------------------------------------------
Tue Feb 5 18:39:39 UTC 2019 - andy@onthewings.net

5
ocaml-cppo.spec
View File

@ -31,8 +31,6 @@ License: BSD-3-Clause
Group: Development/Languages/OCaml
Url: https://github.com/ocaml-community/cppo
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTEAM ocaml-cppo-1.6.1-install-args.patch -- Allows to pass buildroot to opam-installer
Patch: ocaml-cppo-1.6.1-install-args.patch
BuildRequires: ocaml
BuildRequires: ocaml-dune
BuildRequires: ocaml-ocamldoc
@ -69,7 +67,6 @@ developing applications that use %{name}.
%prep
%setup -q
%patch -p1
%build
dune build @install --profile release
@ -77,7 +74,7 @@ dune build @install --profile release
%install
%if %{with opam}
install -d %{buildroot}%{_libdir}/ocaml
%make_install INSTALL_ARGS="--prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml"
dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml
rm -r %{buildroot}%{_prefix}/doc
%else
# By hand, not funny