Skip to content

U
uniset2
Commit dd96d321 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

remove std=c++11 cflags

parent a8f13962
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
README.md
View file @ dd96d321
...@@ -23,6 +23,8 @@ with open source third-party libraries. UniSet provides the consistent interface ...@@ -23,6 +23,8 @@ with open source third-party libraries. UniSet provides the consistent interface
add-on components and third-party libraries. Python wrapper helps in using the library add-on components and third-party libraries. Python wrapper helps in using the library
in python scripts. in python scripts.
libuniset requires minimum C++11
More information: More information:
* [RU] https://habr.com/post/278535/ * [RU] https://habr.com/post/278535/
* [RU] https://habr.com/post/171711/ * [RU] https://habr.com/post/171711/
......
conf/libuniset2.spec
View file @ dd96d321
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.8 Version: 2.8
Release: alt10 Release: alt11
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: LGPL License: LGPL
...@@ -544,6 +544,9 @@ rm -f %buildroot%_docdir/%oname/html/*.md5 ...@@ -544,6 +544,9 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
# history of current unpublished changes # history of current unpublished changes
%changelog %changelog
* Sun Jan 26 2020 Pavel Vainerman <pv@altlinux.ru> 2.8-alt11
- remove std=c++11 cflags
* Thu Dec 19 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt10 * Thu Dec 19 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt10
- (DBServer_PostrgeSQL): fix for check connection - (DBServer_PostrgeSQL): fix for check connection
......
configure.ac
View file @ dd96d321
...@@ -454,7 +454,7 @@ CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Woverloaded-virtual -Woverflow -D_GLIBCXX_U ...@@ -454,7 +454,7 @@ CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Woverloaded-virtual -Woverflow -D_GLIBCXX_U
# export # export
LDFLAGS="$LDFLAGS ${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS} ${POCO_LIBS} ${EV_LIBS}" LDFLAGS="$LDFLAGS ${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS} ${POCO_LIBS} ${EV_LIBS}"
# all developer liked options add to autogen.sh, please # all developer liked options add to autogen.sh, please
CXXFLAGS="-I\$(top_builddir)/include $CXXFLAGS -funsigned-char -std=c++11 -g -DCATCH_VERSION_MAJOR=${CATCH_VERSION_MAJOR} -D_GNU_SOURCE ${REST_API_CFLAGS} ${COMPORT_485F_CFLAGS} ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} ${POCO_CFLAGS} ${EV_CFLAGS} $CXX_EXTRA_FLAGS" CXXFLAGS="-I\$(top_builddir)/include $CXXFLAGS -funsigned-char -g -DCATCH_VERSION_MAJOR=${CATCH_VERSION_MAJOR} -D_GNU_SOURCE ${REST_API_CFLAGS} ${COMPORT_485F_CFLAGS} ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} ${POCO_CFLAGS} ${EV_CFLAGS} $CXX_EXTRA_FLAGS"
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(CXXFLAGS) AC_SUBST(CXXFLAGS)
......
libUniSet2.pc.in
View file @ dd96d321
...@@ -8,4 +8,4 @@ Description: Support library for UniSet ...@@ -8,4 +8,4 @@ Description: Support library for UniSet
Requires: libxml-2.0 sigc++-2.0 omniORB4 libev Requires: libxml-2.0 sigc++-2.0 omniORB4 libev
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lUniSet2 -lPocoFoundation -lPocoNet @REST_API_CLIBS@ Libs: -L${libdir} -lUniSet2 -lPocoFoundation -lPocoNet @REST_API_CLIBS@
Cflags: -I${includedir}/@PACKAGE@ -D__OMNIORB4 -std=c++11 -D_GLIBCXX_USE_NANOSLEEP @REST_API_CFLAGS@ Cflags: -I${includedir}/@PACKAGE@ -D__OMNIORB4 -D_GLIBCXX_USE_NANOSLEEP @REST_API_CFLAGS@
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