summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2018-08-28 15:06:10 +0300
committerSlava Barinov <v.barinov@samsung.com>2018-08-31 10:46:14 +0300
commit98d9e106d8d83a3aba47c1521d9ac0092dafb851 (patch)
tree5e4e657ab855987ef48bf8cbd29b5edd733e36bc
parent0a29d62ebb51db2f2cc111ce1977fb5530486257 (diff)
downloadflex-tizen_5.5_base_wearable_hotfix.tar.gz
flex-tizen_5.5_base_wearable_hotfix.tar.bz2
flex-tizen_5.5_base_wearable_hotfix.zip
-rw-r--r--Makefile.am4
-rw-r--r--packaging/baselibs.conf1
-rw-r--r--packaging/flex.spec21
-rw-r--r--packaging/lex-wrapper.sh2
4 files changed, 9 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index eb68d2f..638c549 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,8 +42,8 @@ EXTRA_DIST = \
autogen.sh
SUBDIRS = \
- lib \
- . \
+ src \
+ doc \
examples \
po \
tests \
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
deleted file mode 100644
index b03c40c..0000000
--- a/packaging/baselibs.conf
+++ /dev/null
@@ -1 +0,0 @@
-flex
diff --git a/packaging/flex.spec b/packaging/flex.spec
index 7c33f85..3b0edfb 100644
--- a/packaging/flex.spec
+++ b/packaging/flex.spec
@@ -1,14 +1,12 @@
%define keepstatic 1
Name: flex
-Version: 2.5.37
+Version: 2.6.4
Release: 0
License: BSD-3-Clause
Summary: Fast Lexical Analyzer Generator
Url: http://flex.sourceforge.net/
Group: Development/Languages/C and C++
Source: %{name}-%{version}.tar.bz2
-Source1: lex-wrapper.sh
-Source3: baselibs.conf
Source1001: flex.manifest
BuildRequires: automake
BuildRequires: makeinfo
@@ -26,26 +24,21 @@ patterns in text.
cp %{SOURCE1001} .
%build
-autoreconf -fi
-%configure --disable-nls
-make %{?_smp_mflags}
+%reconfigure --disable-nls --disable-shared
+%{__make} %{?_smp_mflags}
%check
-%if !0%{?qemu_user_space_build:1}
-make check
-%endif
+%{__make} %{?_smp_mflags} check
%install
%make_install
-install %{SOURCE1} %{buildroot}/%{_bindir}/lex
%remove_docs
%files
%manifest %{name}.manifest
%license COPYING
%defattr(-,root,root)
-/usr/bin/flex
-/usr/bin/flex++
-/usr/bin/lex
-/usr/include/FlexLexer.h
+%{_bindir}/flex
+%{_bindir}/flex++
+%{_includedir}/FlexLexer.h
%{_libdir}/libfl.a
diff --git a/packaging/lex-wrapper.sh b/packaging/lex-wrapper.sh
deleted file mode 100644
index 7051b86..0000000
--- a/packaging/lex-wrapper.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/flex -l "$@"