- drop findlib-1.3.3.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=69
This commit is contained in:
Olaf Hering
Git OBS Bridge
parent
d974221beb
commit
53c010464a
@ -1,127 +0,0 @@
|
|||||||
---
|
|
||||||
Makefile | 32 ++++++++++++++++----------------
|
|
||||||
src/findlib-toolbox/Makefile | 2 +-
|
|
||||||
src/findlib/Makefile | 22 +++++++++++-----------
|
|
||||||
3 files changed, 28 insertions(+), 28 deletions(-)
|
|
||||||
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -17,14 +17,14 @@ opt:
|
|
||||||
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
|
|
||||||
|
|
||||||
install:
|
|
||||||
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
|
|
||||||
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
|
|
||||||
$(MAKE) install-config
|
|
||||||
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
|
|
||||||
$(MAKE) install-meta
|
|
||||||
test -z "$(NUMTOP)" || { cd src/findlib; $(MAKE) install-num-top; }
|
|
||||||
if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
|
|
||||||
- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
|
|
||||||
+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
|
|
||||||
fi
|
|
||||||
$(MAKE) install-doc
|
|
||||||
|
|
||||||
@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in
|
|
||||||
|
|
||||||
.PHONY: install-doc
|
|
||||||
install-doc:
|
|
||||||
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
|
|
||||||
- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
|
|
||||||
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
|
|
||||||
+ -cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
|
|
||||||
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
|
|
||||||
|
|
||||||
.PHONY: uninstall-doc
|
|
||||||
uninstall-doc:
|
|
||||||
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
|
|
||||||
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
|
|
||||||
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
|
|
||||||
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
|
|
||||||
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
|
|
||||||
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
|
|
||||||
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
|
|
||||||
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
|
|
||||||
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
|
|
||||||
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
|
|
||||||
|
|
||||||
|
|
||||||
.PHONY: install-meta
|
|
||||||
install-meta:
|
|
||||||
- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
|
|
||||||
+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
|
|
||||||
|
|
||||||
.PHONY: uninstall-meta
|
|
||||||
uninstall-meta:
|
|
||||||
- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
|
|
||||||
+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
|
|
||||||
|
|
||||||
.PHONY: install-config
|
|
||||||
install-config:
|
|
||||||
- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
|
|
||||||
- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
|
|
||||||
- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
|
|
||||||
+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
|
|
||||||
+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
|
|
||||||
+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
|
|
||||||
|
|
||||||
.PHONY: uninstall-config
|
|
||||||
uninstall-config:
|
|
||||||
--- a/src/findlib-toolbox/Makefile
|
|
||||||
+++ b/src/findlib-toolbox/Makefile
|
|
||||||
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
|
|
||||||
findlib.cma make_wizard.ml
|
|
||||||
|
|
||||||
install:
|
|
||||||
- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
|
|
||||||
+ cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
|
|
||||||
|
|
||||||
# uninstall: Nothing to do, because the removal of the findlib core also
|
|
||||||
# deinstalls the make_wizard
|
|
||||||
--- a/src/findlib/Makefile
|
|
||||||
+++ b/src/findlib/Makefile
|
|
||||||
@@ -121,30 +121,30 @@ clean:
|
|
||||||
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
|
|
||||||
|
|
||||||
install: all
|
|
||||||
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
||||||
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
|
|
||||||
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
|
|
||||||
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
|
|
||||||
files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
|
|
||||||
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
||||||
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
||||||
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
|
|
||||||
- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
|
|
||||||
+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
|
|
||||||
# the following "if" block is only needed for 4.00beta2
|
|
||||||
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
|
|
||||||
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
|
|
||||||
- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
|
|
||||||
+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
install-num-top:
|
|
||||||
- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
|
|
||||||
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
|
|
||||||
cp num_top.cma num_top.cmi num_top_printers.cmi \
|
|
||||||
- "$(prefix)$(OCAML_SITELIB)/num-top"
|
|
||||||
+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
|
|
||||||
|
|
||||||
# Note: uninstall-num-top is part of the removal of the META files.
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
- rm -f $(prefix)$(OCAML_CORE_STDLIB)/findlib
|
|
||||||
- rm -rf $(prefix)$(OCAML_SITELIB)/$(NAME)
|
|
||||||
- rm -f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
|
|
||||||
+ rm -f $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/findlib
|
|
||||||
+ rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
|
|
||||||
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
|
|
||||||
|
|
||||||
|
|
||||||
depend: *.ml *.mli fl_meta.ml fl_metascanner.ml
|
|
||||||
@ -6,7 +6,7 @@ Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
|
Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
|
||||||
|
|
||||||
- Update to upstream version 1.7.3
|
- Update to upstream version 1.7.3
|
||||||
Fix regarding num-top: this library is now also optional, as num.
|
Fix regarding num-top: this library is now also optional, as num.
|
||||||
Trying to protect against failures when several package installs are done in parallel.
|
Trying to protect against failures when several package installs are done in parallel.
|
||||||
New subpackage "findlib.top" for the toploop
|
New subpackage "findlib.top" for the toploop
|
||||||
@ -18,6 +18,7 @@ Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
|
|||||||
Build with -opaque
|
Build with -opaque
|
||||||
Preliminary support for native toplevel
|
Preliminary support for native toplevel
|
||||||
New options: ocamlfind query -qe -qo
|
New options: ocamlfind query -qe -qo
|
||||||
|
- drop findlib-1.3.3.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
|
Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
|
||||||
|
|||||||
@ -27,7 +27,6 @@ Group: Development/Languages/OCaml
|
|||||||
|
|
||||||
Url: http://projects.camlcity.org/projects/findlib.html
|
Url: http://projects.camlcity.org/projects/findlib.html
|
||||||
Source0: findlib-%{version}.tar.xz
|
Source0: findlib-%{version}.tar.xz
|
||||||
Patch0: findlib-1.3.3.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
#
|
#
|
||||||
Recommends: ocaml-findlib-camlp4
|
Recommends: ocaml-findlib-camlp4
|
||||||
@ -75,7 +74,6 @@ The ocaml-findlib-camlp4 contains signature files for developing applications th
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n findlib-%{version}
|
%setup -q -n findlib-%{version}
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
(cd tools/extract_args && make)
|
(cd tools/extract_args && make)
|
||||||
@ -92,7 +90,7 @@ make opt
|
|||||||
rm doc/guide-html/TIMESTAMP
|
rm doc/guide-html/TIMESTAMP
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install prefix=$RPM_BUILD_ROOT
|
||||||
rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
|
rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user