[SCM] tango branch, master, updated. debian/8.0.5+dfsg-3-9-gf485a73
Picca Frédéric-Emmanuel
picca at debian.org
Tue Jul 9 12:09:23 UTC 2013
The following commit has been merged in the master branch:
commit f485a7342c90207c4a569f86889527eb6214571f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue Jul 9 11:01:45 2013 +0200
remove upstream integrated patch
diff --git a/debian/changelog b/debian/changelog
index ca89cb0..d62ae7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ tango (8.1.2+dfsg-1) unstable; urgency=low
* 0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch
* 0006-upstream-fix-p805_2.patch
* 0007-upstream-attempt-to-fix-the-powerpc-FTBFS.patch
- - new
- * 0004-forwarded-upstream-use-the-autoconf-standard-macro-f.patch
-- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 11 Jun 2013 14:18:05 +0200
diff --git a/debian/patches/0004-forwarded-upstream-use-the-autoconf-standard-macro-f.patch b/debian/patches/0004-forwarded-upstream-use-the-autoconf-standard-macro-f.patch
deleted file mode 100644
index daafb52..0000000
--- a/debian/patches/0004-forwarded-upstream-use-the-autoconf-standard-macro-f.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 11 Jun 2013 14:16:17 +0200
-Subject: forwarded upstream use the autoconf standard macro for C++11.
-
----
- configure.in | 19 +--
- cppserver/AbstractClass/AccessControl/Makefile.am | 2 -
- cppserver/database/Makefile.am | 2 +-
- cppserver/starter/Makefile.am | 2 -
- cppserver/tangoaccesscontrol/Makefile.am | 2 -
- cppserver/tangotest/Makefile.am | 2 -
- lib/cpp/client/Makefile.am | 2 +-
- lib/cpp/server/Makefile.am | 2 +-
- lib/cpp/tango.pc.in | 2 +-
- m4/ax_cxx_compile_stdcxx_11.m4 | 133 +++++++++++++++++++++
- utils/notifd2db/Makefile.am | 2 -
- utils/tango_admin/Makefile.am | 2 -
- 12 files changed, 140 insertions(+), 32 deletions(-)
- create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4
-
-diff --git a/configure.in b/configure.in
-index ff8f537..0e9a968 100644
---- a/configure.in
-+++ b/configure.in
-@@ -74,21 +74,9 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-
--# Check gcc release
--
-- if test "$CXX" = "c++" -o "$CXX" = "g++"
-- then
-- gcc_AC_HAVE_GCC_VERSION(3,2,0)
-- if test "x$ac_cv_gcc_version_3_2_0" = "xno"; then
-- AC_MSG_ERROR([Not supported gcc release. Should be 3.2.0 or above. Please update !],-1)
-- fi
-- gcc_AC_HAVE_GCC_VERSION(4,3,0)
-- if test "x$ac_cv_gcc_version_4_3_0" = "xyes"; then
-- CPP_ELEVEN="-std=c++0x"
-- else
-- CPP_ELEVEN=""
-- fi
-- fi
-+# Check if c++11 is supported.
-+
-+AX_CXX_COMPILE_STDCXX_11([noext],[optional])
-
- # Check if Java interpreter is there
-
-@@ -369,7 +357,6 @@ fi
-
- AC_SUBST(JPEG_LIB_CXXFLAGS)
- AC_SUBST(JPEG_MMX_LIB_CXXFLAGS)
--AC_SUBST(CPP_ELEVEN)
-
- # Define a conditional variables to enable or disable installation
- # of the database server and the database schema creation.
-diff --git a/cppserver/AbstractClass/AccessControl/Makefile.am b/cppserver/AbstractClass/AccessControl/Makefile.am
-index 3620747..5b030c6 100644
---- a/cppserver/AbstractClass/AccessControl/Makefile.am
-+++ b/cppserver/AbstractClass/AccessControl/Makefile.am
-@@ -5,8 +5,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
- -I$(top_srcdir)/lib/cpp/log4tango/include \
- -I$(top_builddir)/lib/cpp/log4tango/include
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- # We're making a libtool convenience library which is not to be installed,
- # therefore the automake noinst variable
- noinst_LTLIBRARIES = libaccesscontrol.la
-diff --git a/cppserver/database/Makefile.am b/cppserver/database/Makefile.am
-index 97d7460..eb9af4d 100644
---- a/cppserver/database/Makefile.am
-+++ b/cppserver/database/Makefile.am
-@@ -6,7 +6,7 @@ INCLUDES = $(ORB_INCLUDE_PREFIX) $(LIBZMQ_CFLAGS) \
- $(MYSQLCLIENT_CFLAGS) \
- $(ZLIB_CPPFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@ -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
-+AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
-
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
- -llog4tango $(MYSQLCLIENT_LDFLAGS) \
-diff --git a/cppserver/starter/Makefile.am b/cppserver/starter/Makefile.am
-index 0ba3b9b..aecbb52 100644
---- a/cppserver/starter/Makefile.am
-+++ b/cppserver/starter/Makefile.am
-@@ -5,8 +5,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/server \
- -I$(top_srcdir)/lib/cpp/log4tango/include \
- -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango \
- -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
- $(LIBZMQ_LIBS)
-diff --git a/cppserver/tangoaccesscontrol/Makefile.am b/cppserver/tangoaccesscontrol/Makefile.am
-index 60580c9..71754bd 100644
---- a/cppserver/tangoaccesscontrol/Makefile.am
-+++ b/cppserver/tangoaccesscontrol/Makefile.am
-@@ -7,8 +7,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
- -I$(top_srcdir)/cppserver/AbstractClass/AccessControl \
- $(MYSQLCLIENT_CFLAGS) $(LIBZMQ_CFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- bin_PROGRAMS=TangoAccessControl
-
- TangoAccessControl_SOURCES=ClassFactory.cpp \
-diff --git a/cppserver/tangotest/Makefile.am b/cppserver/tangotest/Makefile.am
-index 73c72a5..e332986 100644
---- a/cppserver/tangotest/Makefile.am
-+++ b/cppserver/tangotest/Makefile.am
-@@ -4,8 +4,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
- -I$(top_srcdir)/lib/cpp/log4tango/include \
- -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango \
- -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
- $(LIBZMQ_LIBS)
-diff --git a/lib/cpp/client/Makefile.am b/lib/cpp/client/Makefile.am
-index 192fbe8..f914e96 100644
---- a/lib/cpp/client/Makefile.am
-+++ b/lib/cpp/client/Makefile.am
-@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/server \
- # therefore the automake noinst variable
- noinst_LTLIBRARIES = libclient.la
-
--AM_CXXFLAGS=-D_TANGO_LIB @CPP_ELEVEN@
-+AM_CXXFLAGS=-D_TANGO_LIB
-
- # These are the sources for the library.
- libclient_la_SOURCES = dbapi_class.cpp \
-diff --git a/lib/cpp/server/Makefile.am b/lib/cpp/server/Makefile.am
-index 9334e62..d519df4 100644
---- a/lib/cpp/server/Makefile.am
-+++ b/lib/cpp/server/Makefile.am
-@@ -20,7 +20,7 @@ libtango_la_LIBADD = ../client/libclient.la \
- # generate the correct .so version
- libtango_la_LDFLAGS=-version-info $(VERSION_INFO)
-
--AM_CXXFLAGS=-D_TANGO_LIB @CPP_ELEVEN@
-+AM_CXXFLAGS=-D_TANGO_LIB
-
- if DARWIN_ENABLED
- AM_LDFLAGS=-flat_namespace --disable-dependency-tracking
-diff --git a/lib/cpp/tango.pc.in b/lib/cpp/tango.pc.in
-index 95f472e..870c07d 100644
---- a/lib/cpp/tango.pc.in
-+++ b/lib/cpp/tango.pc.in
-@@ -8,4 +8,4 @@ Description: The tango constrol system library
- Requires: omniDynamic4 >= 4.1.2, omniCOS4, log4tango, libzmq
- Version: @VERSION@
- Libs: -L${libdir} -ltango
--Cflags: @CPP_ELEVEN@ -I${includedir}/tango
-+Cflags: -I${includedir}/tango
-diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
-new file mode 100644
-index 0000000..af37acd
---- /dev/null
-+++ b/m4/ax_cxx_compile_stdcxx_11.m4
-@@ -0,0 +1,133 @@
-+# ============================================================================
-+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-+# ============================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+# Check for baseline language coverage in the compiler for the C++11
-+# standard; if necessary, add switches to CXXFLAGS to enable support.
-+#
-+# The first argument, if specified, indicates whether you insist on an
-+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+# -std=c++11). If neither is specified, you get whatever works, with
-+# preference for an extended mode.
-+#
-+# The second argument, if specified 'mandatory' or if left unspecified,
-+# indicates that baseline C++11 support is required and that the macro
-+# should error out if no mode with that support is found. If specified
-+# 'optional', then configuration proceeds regardless, after defining
-+# HAVE_CXX11 if and only if a supporting mode is found.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2008 Benjamin Kosnik <bkoz at redhat.com>
-+# Copyright (c) 2012 Zack Weinberg <zackw at panix.com>
-+# Copyright (c) 2013 Roy Stogner <roystgnr at ices.utexas.edu>
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice
-+# and this notice are preserved. This file is offered as-is, without any
-+# warranty.
-+
-+#serial 3
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-+ template <typename T>
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check<check<bool>> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check<int> check_type;
-+ check_type c;
-+ check_type&& cr = static_cast<check_type&&>(c);
-+
-+ auto d = a;
-+])
-+
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-+ m4_if([$1], [], [],
-+ [$1], [ext], [],
-+ [$1], [noext], [],
-+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-+ [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+ AC_LANG_PUSH([C++])dnl
-+ ac_success=no
-+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-+ ax_cv_cxx_compile_cxx11,
-+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+ [ax_cv_cxx_compile_cxx11=yes],
-+ [ax_cv_cxx_compile_cxx11=no])])
-+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-+ ac_success=yes
-+ fi
-+
-+ m4_if([$1], [noext], [], [dnl
-+ if test x$ac_success = xno; then
-+ for switch in -std=gnu++11 -std=gnu++0x; do
-+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+ $cachevar,
-+ [ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS $switch"
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+ [eval $cachevar=yes],
-+ [eval $cachevar=no])
-+ CXXFLAGS="$ac_save_CXXFLAGS"])
-+ if eval test x\$$cachevar = xyes; then
-+ CXXFLAGS="$CXXFLAGS $switch"
-+ ac_success=yes
-+ break
-+ fi
-+ done
-+ fi])
-+
-+ m4_if([$1], [ext], [], [dnl
-+ if test x$ac_success = xno; then
-+ for switch in -std=c++11 -std=c++0x; do
-+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+ $cachevar,
-+ [ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS $switch"
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+ [eval $cachevar=yes],
-+ [eval $cachevar=no])
-+ CXXFLAGS="$ac_save_CXXFLAGS"])
-+ if eval test x\$$cachevar = xyes; then
-+ CXXFLAGS="$CXXFLAGS $switch"
-+ ac_success=yes
-+ break
-+ fi
-+ done
-+ fi])
-+ AC_LANG_POP([C++])
-+ if test x$ax_cxx_compile_cxx11_required = xtrue; then
-+ if test x$ac_success = xno; then
-+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-+ fi
-+ else
-+ if test x$ac_success = xno; then
-+ HAVE_CXX11=0
-+ AC_MSG_NOTICE([No compiler with C++11 support was found])
-+ else
-+ HAVE_CXX11=1
-+ AC_DEFINE(HAVE_CXX11,1,
-+ [define if the compiler supports basic C++11 syntax])
-+ fi
-+
-+ AC_SUBST(HAVE_CXX11)
-+ fi
-+])
-diff --git a/utils/notifd2db/Makefile.am b/utils/notifd2db/Makefile.am
-index 23ad7d6..74837e0 100644
---- a/utils/notifd2db/Makefile.am
-+++ b/utils/notifd2db/Makefile.am
-@@ -4,8 +4,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
- -I$(top_srcdir)/lib/cpp/log4tango/include \
- -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango \
- -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
- $(LIBZMQ_LIBS)
-diff --git a/utils/tango_admin/Makefile.am b/utils/tango_admin/Makefile.am
-index dde9677..1f7551e 100644
---- a/utils/tango_admin/Makefile.am
-+++ b/utils/tango_admin/Makefile.am
-@@ -4,8 +4,6 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
- -I$(top_srcdir)/lib/cpp/log4tango/include \
- -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
-
--AM_CXXFLAGS= @CPP_ELEVEN@
--
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango \
- -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
- $(LIBZMQ_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 4fd68c5..31d0855 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-debian-fix_database_scripts.patch
0002-debian-my.cnf.in.patch
0003-debian-notify_daemon.patch
-0004-forwarded-upstream-use-the-autoconf-standard-macro-f.patch
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list