Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
dda7dd4115 !3 fix ragel-* command segfault
From: @si-gui
Reviewed-by: @yanan-rock
Signed-off-by: @yanan-rock
2020-09-21 22:42:52 +08:00
si-gui
50d18a9505 Fix ragel-d,ragel-go,ragel-java such command segfault error 2020-09-21 21:14:59 +08:00
si-gui
bbc8452b2d fix ragel-* command segfault 2020-09-21 20:56:45 +08:00
si-gui
6f770958a4 fix ragel-* command segfault 2020-09-21 20:41:51 +08:00
openeuler-ci-bot
da94b4e9ee !1 初始化ragel包
Merge pull request !1 from Yikun/master
2020-07-09 09:42:08 +08:00
Yikun
ef901ebd55 update ragel.spec. 2020-07-07 09:47:06 +08:00
Yikun
cb27f2bac3 删除文件 colm-version-upgrade.patch 2020-07-07 09:46:49 +08:00
Yikun
97359dc6e0 colm version upgrade 2020-06-23 14:58:37 +08:00
Yikun
39b3c0fa12 update ragel.spec. 2020-06-23 10:09:48 +08:00
Yikun Jiang
2efdece2a9 Add ragel init package 2020-06-22 14:50:57 +08:00
3 changed files with 123 additions and 0 deletions

View File

@ -0,0 +1,39 @@
From 5482a621c75baad6dee31f5f6a1d38bf5849d4eb Mon Sep 17 00:00:00 2001
From: si-gui <245140120@qq.com>
Date: Mon, 21 Sep 2020 20:01:10 +0800
Subject: [PATCH] Fix ragel-d,ragel-go,ragel-java such command segfault error
Signed-off-by: si-gui <245140120@qq.com>
---
src/inputdata.cc | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/inputdata.cc b/src/inputdata.cc
index 8a6de8b..e6d4f73 100644
--- a/src/inputdata.cc
+++ b/src/inputdata.cc
@@ -1105,9 +1105,19 @@ void InputData::wait( const char *what, pid_t pid )
int InputData::rlhcMain( int argc, const char **argv )
{
pid_t pid = 0;
+ int code = 0;
+ try {
+ parseArgs( argc, argv );
+ checkArgs();
+
+ if ( !process() )
+ abortCompile( 1 );
+ }
+ catch ( const AbortCompile &ac ) {
+ code = ac.code;
+ return code;
+ }
- parseArgs( argc, argv );
- checkArgs();
makeDefaultFileName();
makeTranslateOutputFileName();
--
2.23.0

BIN
ragel-7.0.0.12.tar.gz Normal file

Binary file not shown.

84
ragel.spec Normal file
View File

@ -0,0 +1,84 @@
%bcond_with bootstrap
Name: ragel
Version: 7.0.0.12
Release: 2
Summary: Finite state machine compiler
# aapl/ is the LGPLv2+
License: MIT and LGPLv2+
URL: http://www.colm.net/open-source/%{name}/
Source0: https://www.colm.net/files/%{name}/%{name}-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: make
%if %{with bootstrap}
BuildRequires: kelbt
BuildRequires: ragel
%endif
BuildRequires: colm-devel
# Unfortunately, upstream doesn't exist and not possible to find version
Provides: bundled(aapl)
Patch0000: 0001-Fix-ragel-d-ragel-go-ragel-java-such-command-segfault.patch
%description
Ragel compiles executable finite state machines from regular languages.
Ragel targets C, C++ and ASM. Ragel state machines can not only recognize
byte sequences as regular expression machines do, but can also execute code
at arbitrary points in the recognition of a regular language. Code embedding
is done using inline operators that do not disrupt the regular language syntax.
%package devel
Summary: Development libraries header files for %{name}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
%{summary}.
%prep
%autosetup -p1
# Do not pollute with docs
sed -i -e "/dist_doc_DATA/d" Makefile.am
%build
autoreconf -vfi
%configure --disable-static
%make_build
%install
%make_install
find %{buildroot}%{_libdir} -type f -name '*.la' -print -delete
install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim
%ldconfig_scriptlets
%files
%license COPYING
%doc CREDITS ChangeLog
%{_bindir}/%{name}
%{_bindir}/%{name}-*
%{_mandir}/man1/%{name}.1*
%{_libdir}/libfsm.so.*
%{_libdir}/libragel.so.*
%{_datarootdir}/%{name}.lm
%dir %{_datadir}/vim
%dir %{_datadir}/vim/vimfiles
%dir %{_datadir}/vim/vimfiles/syntax
%{_datadir}/vim/vimfiles/syntax/%{name}.vim
%files devel
%{_libdir}/libfsm.so
%{_libdir}/libragel.so
%{_includedir}/%{name}/
%changelog
* Mon Sep 21 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 7.0.0.12-2
- Fix ragel-d ragel-go ragel-java eg. command segfault
* Mon Jun 22 2020 Yikun Jiang <yikunkero@gmail.com> - 7.0.0.12-1
- Package init