Commit 89f7f8a5 authored by Vitaly Lipatov's avatar Vitaly Lipatov

travis: fix comedi build on Ubuntu

parent 2fc81b8e
......@@ -26,15 +26,18 @@ before_install:
#- wget http://launchpadlibrarian.net/213890956/libcomedi0_0.10.2-3_i386.deb
#- wget http://launchpadlibrarian.net/213890952/libcomedi-dev_0.10.2-3_i386.deb
#- sudo dpkg -i libcomedi0_0.10.2-3_i386.deb libcomedi-dev_0.10.2-3_i386.deb
- wget http://launchpadlibrarian.net/213890962/libcomedi-dev_0.10.2-3_amd64.deb
- wget http://launchpadlibrarian.net/213890966/libcomedi0_0.10.2-3_amd64.deb
#- wget http://launchpadlibrarian.net/213890962/libcomedi-dev_0.10.2-3_amd64.deb
#- wget http://launchpadlibrarian.net/213890966/libcomedi0_0.10.2-3_amd64.deb
# TODO: replace it all with epm
- sudo dpkg -i libcomedi-dev_0.10.2-3_amd64.deb libcomedi0_0.10.2-3_amd64.deb || sudo apt-get -f install
#- sudo dpkg -i libcomedi-dev_0.10.2-3_amd64.deb libcomedi0_0.10.2-3_amd64.deb || sudo apt-get -f install
install:
# - libcomedi-dev
- sudo apt-get install libcommoncpp2-dev libmysqlclient-dev libomniorb4-dev omniidl libpqxx3-dev librrd-dev libsigc++-2.0-dev libsqlite3-dev python-dev
- sudo apt-get install libcomedi-dev libcommoncpp2-dev libmysqlclient-dev libomniorb4-dev omniidl libpqxx3-dev librrd-dev libsigc++-2.0-dev libsqlite3-dev python-dev
before_script:
- export CXXFLAGS='-pipe -O2 -pedantic -Wall'
# hack for broken comedi
- export LDFLAGS='-lm'
- autoreconf -fiv
- ./configure --disable-tests
......
......@@ -278,7 +278,7 @@ AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual"
# export
LDFLAGS="${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS}"
LDFLAGS="$LDFLAGS ${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS}"
# all developer liked options add to autogen.sh, please
CXXFLAGS="$CXXFLAGS -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} -I\$(top_builddir)/include $CXX_EXTRA_FLAGS"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment