Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
9361d65a
Commit
9361d65a
authored
Dec 14, 2017
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(travis): Добавил возможность отключать сборку LogDB --disable-logdb
parent
54c0ffd0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
3 deletions
+28
-3
.travis.yml
.travis.yml
+1
-1
libuniset2.spec
conf/libuniset2.spec
+6
-1
configure.ac
configure.ac
+20
-0
Makefile.am
extensions/LogDB/Makefile.am
+1
-1
No files found.
.travis.yml
View file @
9361d65a
...
...
@@ -38,7 +38,7 @@ before_script:
# due broken comedi
-
export CXXFLAGS="$CXXFLAGS -Wl,--unresolved-symbols=ignore-in-shared-libs"
-
autoreconf -fiv
-
./configure --enable-tests --enable-mysql --enable-sqlite --enable-rrd --enable-io --disable-python --disable-mqtt --disable-pgsql --disable-api --disable-pkgchecklibev --disable-netdata
-
./configure --enable-tests --enable-mysql --enable-sqlite --enable-rrd --enable-io --disable-python --disable-mqtt --disable-pgsql --disable-api --disable-pkgchecklibev --disable-netdata
--disable-logdb
script
:
-
if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make ; fi
...
...
conf/libuniset2.spec
View file @
9361d65a
...
...
@@ -11,6 +11,7 @@
%def_disable mqtt
%def_disable netdata
%def_enable api
%def_enable logdb
%define oname uniset2
...
...
@@ -210,6 +211,7 @@ Requires: %name-extension-common = %version-%release
%description extension-sqlite-devel
Libraries needed to develop for uniset SQLite
%if_enabled logdb
%package extension-logdb
Group: Development/C++
Summary: database for %name logs (sqlite)
...
...
@@ -218,6 +220,7 @@ Requires: %name-extension-sqlite = %version-%release
%description extension-logdb
Database (sqlite) for logs for %name
%endif
%endif
%if_enabled pgsql
%package extension-pgsql
...
...
@@ -323,7 +326,7 @@ SharedMemoryPlus extension ('all in one') for libuniset
%build
%autoreconf
%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata}
%configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata}
%{subst_enable logdb}
%make_build
# fix for ALTLinux build (noarch)
...
...
@@ -394,9 +397,11 @@ rm -f %buildroot%_libdir/*.la
%_pkgconfigdir/libUniSet2SQLite.pc
%_includedir/%oname/extensions/sqlite/
%if_enabled logdb
%files extension-logdb
%_bindir/%oname-logdb*
%endif
%endif
%if_enabled pgsql
%files extension-pgsql
...
...
configure.ac
View file @
9361d65a
...
...
@@ -330,6 +330,26 @@ if cat ${CATCH_FILE} | grep -q "Catch v2."; then
fi
AC_MSG_RESULT([$CATCH_VERSION_MAJOR])
#check logdb support
AC_MSG_CHECKING([logdb build])
buildlogdb=true
AC_ARG_ENABLE(logdb, AC_HELP_STRING([--disable-logdb], [disable LogDB build]),
[ if test $enableval = yes; then buildlogdb=true; else buildlogdb=false; fi],[ buildlogdb=true; ])
if test ${buildsqlite} = true; then
if test ${buildlogdb} = true; then
AC_MSG_RESULT([enabled])
else
AC_MSG_RESULT([disabled])
fi
else
buildlogdb=false
AC_MSG_RESULT([disabled (sqlite disabled)])
fi
AM_CONDITIONAL(DISABLE_LOGDB, test ${buildlogdb} = false)
COV_LIBS=
COV_CFLAGS=
AC_MSG_CHECKING([tests support])
...
...
extensions/LogDB/Makefile.am
View file @
9361d65a
if
DISABLE_
SQLITE
if
DISABLE_
LOGDB
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment