update to 2.1
This commit is contained in:
Andy Li
parent
23cfead6dc
commit
6b0115b8c2
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/ocaml-sedlex-1.99.4.tar.gz
|
||||
/ocaml-sedlex-2.1.tar.gz
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/src/lib/Makefile b/src/lib/Makefile
|
||||
index 0544095..e584557 100644
|
||||
--- a/src/lib/Makefile
|
||||
+++ b/src/lib/Makefile
|
||||
@@ -12,8 +12,8 @@ sedlexing.cma: $(MODS:.cmo=.mli) $(MODS:.cmo=.ml)
|
||||
ocamlfind ocamlc -package gen -a -o sedlexing.cma $(MODS)
|
||||
|
||||
sedlexing.cmxa: $(MODS:.cmo=.mli) $(MODS:.cmo=.ml)
|
||||
- ocamlfind ocamlopt -package gen -safe-string -c $(MODS:.cmo=.mli) $(MODS:.cmo=.ml)
|
||||
- ocamlfind ocamlopt -package gen -a -o sedlexing.cmxa $(MODS:.cmo=.cmx)
|
||||
+ ocamlfind ocamlopt -g -package gen -safe-string -c $(MODS:.cmo=.mli) $(MODS:.cmo=.ml)
|
||||
+ ocamlfind ocamlopt -g -package gen -a -o sedlexing.cmxa $(MODS:.cmo=.cmx)
|
||||
|
||||
doc:
|
||||
rm -rf ../../libdoc
|
||||
diff --git a/src/syntax/Makefile b/src/syntax/Makefile
|
||||
index ec5b86f..f5d1016 100644
|
||||
--- a/src/syntax/Makefile
|
||||
+++ b/src/syntax/Makefile
|
||||
@@ -7,7 +7,7 @@ include $(shell ocamlc -where)/Makefile.config
|
||||
SRCS=sedlex_cset.mli sedlex_cset.ml unicode63.mli unicode63.ml sedlex.mli sedlex.ml ppx_sedlex.ml
|
||||
|
||||
OCAMLC=ocamlfind ocamlc
|
||||
-OCAMLOPT=ocamlfind ocamlopt
|
||||
+OCAMLOPT=ocamlfind ocamlopt -g
|
||||
PACKAGES=-package ppx_tools_versioned.metaquot_405 -package ocaml-migrate-parsetree
|
||||
OCAMLFLAGS=$(PACKAGES) -linkall -w +A-4-9-42 -annot
|
||||
|
||||
|
||||
@ -1,25 +1,21 @@
|
||||
Name: ocaml-sedlex
|
||||
Version: 1.99.4
|
||||
Release: 7%{?dist}
|
||||
Version: 2.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Unicode-friendly lexer generator
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/alainfrisch/sedlex
|
||||
Source0: https://github.com/alainfrisch/sedlex/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# add -g when calling ocamlopt
|
||||
Patch0: native_debug.diff
|
||||
# https://github.com/ocaml-community/sedlex/issues/64
|
||||
Patch1: ppx_tools_versioned.diff
|
||||
URL: https://github.com/ocaml-community/sedlex
|
||||
Source0: https://github.com/ocaml-community/sedlex/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: ocaml
|
||||
BuildRequires: ocaml-findlib
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: ocaml-dune
|
||||
BuildRequires: ocaml-result-devel
|
||||
BuildRequires: ocaml-migrate-parsetree-devel
|
||||
BuildRequires: ocaml-ppx-derivers-devel
|
||||
BuildRequires: ocaml-ppx-tools-versioned-devel
|
||||
BuildRequires: ocaml-gen-devel
|
||||
BuildRequires: opam-installer
|
||||
|
||||
%description
|
||||
A lexer generator for OCaml, similar to ocamllex, but supporting Unicode.
|
||||
@ -39,31 +35,15 @@ files for developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n sedlex-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# spurious-executable-perm
|
||||
chmod a-x src/syntax/sedlex_cset.ml
|
||||
|
||||
%build
|
||||
make
|
||||
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
make opt
|
||||
%endif
|
||||
dune build -p sedlex --verbose
|
||||
|
||||
%install
|
||||
export DESTDIR=$RPM_BUILD_ROOT
|
||||
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
dune install --destdir="$RPM_BUILD_ROOT" --verbose
|
||||
|
||||
# don't use make_install macro since it passes INSTALL,
|
||||
# which is used differently in the Makefile
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
make install
|
||||
%else
|
||||
make install_byteonly
|
||||
%endif
|
||||
# These will be installed using doc and license directives.
|
||||
rm -r $RPM_BUILD_ROOT%{_prefix}/doc/sedlex/{CHANGES,README.md,LICENSE}
|
||||
|
||||
# Makes *.cmxs and *.opt executable such that they will be stripped.
|
||||
find $RPM_BUILD_ROOT -name '*.{cmxs,opt}' -exec chmod 0755 {} \;
|
||||
@ -90,7 +70,11 @@ find $RPM_BUILD_ROOT -name '*.{cmxs,opt}' -exec chmod 0755 {} \;
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 08 2019 Andy Li <andy@onthewings.net> - 1.99.4-7
|
||||
* Wed Oct 30 2019 Andy Li <andy@onthewings.net> - 2.1-1
|
||||
- New upstream version.
|
||||
- Update URL.
|
||||
|
||||
* Thu Aug 08 2019 Andy Li <andy@onthewings.net> - 1.99.4-7
|
||||
- Add ppx_tools_versioned.diff, fix build.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.99.4-6
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- sedlex-1.99.4/src/syntax/Makefile.orig 2018-10-25 07:55:34.821346628 +0000
|
||||
+++ sedlex-1.99.4/src/syntax/Makefile 2018-10-25 07:58:42.761346628 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
OCAMLC=ocamlfind ocamlc
|
||||
OCAMLOPT=ocamlfind ocamlopt -g
|
||||
-PACKAGES=-package ppx_tools_versioned.metaquot_405 -package ocaml-migrate-parsetree
|
||||
+PACKAGES=-package ppx_tools_versioned.metaquot_405 -package ocaml-migrate-parsetree -package ppx_tools_versioned
|
||||
OCAMLFLAGS=$(PACKAGES) -linkall -w +A-4-9-42 -annot
|
||||
|
||||
all: ppx_sedlex$(EXE) sedlex.cma
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ocaml-sedlex-1.99.4.tar.gz) = 83bddb03e25b015bc71fb59e3b0e0e097e899c681c8033663c17936f28fde8599a82eaab9c26eafd645c401c106e65fcf173d9fb889eb8999eb1b064ff8b6149
|
||||
SHA512 (ocaml-sedlex-2.1.tar.gz) = df379c0b9db396cec454d1ac151f8bfc597d26447f30220f87b0d919be541d44dce56c932a6573d066395932f5d59e429922a0b44c8f853e3954faf1893856eb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user