[tango] 02/03: fix for real the gcc5 problem
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sun Sep 13 11:31:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit c48c5802c69079fbf0d39b535d37c76a066a1bfd
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Sep 13 11:46:27 2015 +0200
fix for real the gcc5 problem
---
.../patches/0009-fix-forwarded-upstream-gcc5.patch | 60 ++++++++
debian/patches/0009-fix-gcc5-compilation.patch | 154 ---------------------
debian/patches/cxx11 | 87 ------------
debian/patches/series | 2 +-
4 files changed, 61 insertions(+), 242 deletions(-)
diff --git a/debian/patches/0009-fix-forwarded-upstream-gcc5.patch b/debian/patches/0009-fix-forwarded-upstream-gcc5.patch
new file mode 100644
index 0000000..19d5dfb
--- /dev/null
+++ b/debian/patches/0009-fix-forwarded-upstream-gcc5.patch
@@ -0,0 +1,60 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 13 Sep 2015 11:45:56 +0200
+Subject: fix forwarded upstream gcc5
+
+---
+ lib/cpp/server/tango_const.h | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/lib/cpp/server/tango_const.h b/lib/cpp/server/tango_const.h
+index cb50194..ccee58a 100644
+--- a/lib/cpp/server/tango_const.h
++++ b/lib/cpp/server/tango_const.h
+@@ -950,18 +950,23 @@ typedef struct _OptAttrProp
+
+
+ // Ranges type-enum-string conversions
++#ifdef _GLIBCXX_USE_CXX11_ABI
++#define TANGO_CXX11_ABI __attribute((abi_tag("cxx11")))
++#else
++#define TANGO_CXX11_ABI
++#endif
+
+ template <typename T>
+ struct ranges_type2const
+ {
+ static CmdArgType enu;
+- static string str;
++ static TANGO_CXX11_ABI string str;
+ };
+
+ template <CmdArgType>
+ struct ranges_const2type
+ {
+- static string str;
++ static TANGO_CXX11_ABI string str;
+ };
+
+ #define RANGES_TYPE2CONST(type,constant) \
+@@ -969,17 +974,17 @@ struct ranges_const2type
+ struct ranges_type2const<type> \
+ { \
+ static CmdArgType enu; \
+- static string str; \
++ static TANGO_CXX11_ABI string str; \
+ }; \
+ CmdArgType ranges_type2const<type>::enu = constant; \
+- string ranges_type2const<type>::str = #type; \
++ TANGO_CXX11_ABI string ranges_type2const<type>::str = #type; \
+ template<> \
+ struct ranges_const2type<Tango::constant> \
+ { \
+ typedef type Type; \
+- static string str; \
++ static TANGO_CXX11_ABI string str; \
+ }; \
+- string ranges_const2type<Tango::constant>::str = #type;
++ TANGO_CXX11_ABI string ranges_const2type<Tango::constant>::str = #type;
+
+ /*
+ * List of strings used by the API as the DevError reason field.
diff --git a/debian/patches/0009-fix-gcc5-compilation.patch b/debian/patches/0009-fix-gcc5-compilation.patch
deleted file mode 100644
index 773b7e3..0000000
--- a/debian/patches/0009-fix-gcc5-compilation.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Wed, 2 Sep 2015 19:53:58 +0200
-Subject: fix gcc5 compilation
-
----
- lib/cpp/server/attribute.cpp | 58 ------------------------------------------
- lib/cpp/server/w_attribute.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 58 insertions(+), 58 deletions(-)
-
-diff --git a/lib/cpp/server/attribute.cpp b/lib/cpp/server/attribute.cpp
-index 858d7af..67ec542 100644
---- a/lib/cpp/server/attribute.cpp
-+++ b/lib/cpp/server/attribute.cpp
-@@ -56,21 +56,6 @@ static const char *RcsId = "$Id: attribute.cpp 22617 2013-05-05 12:53:58Z taurel
- namespace Tango
- {
-
--RANGES_TYPE2CONST(Tango::DevDouble,DEV_DOUBLE)
--RANGES_TYPE2CONST(Tango::DevFloat,DEV_FLOAT)
--RANGES_TYPE2CONST(Tango::DevLong,DEV_LONG)
--RANGES_TYPE2CONST(Tango::DevLong64,DEV_LONG64)
--RANGES_TYPE2CONST(Tango::DevShort,DEV_SHORT)
--RANGES_TYPE2CONST(Tango::DevUChar,DEV_UCHAR)
--RANGES_TYPE2CONST(Tango::DevULong,DEV_ULONG)
--RANGES_TYPE2CONST(Tango::DevULong64,DEV_ULONG64)
--RANGES_TYPE2CONST(Tango::DevUShort,DEV_USHORT)
--RANGES_TYPE2CONST(Tango::DevEncoded,DEV_ENCODED)
--
--RANGES_TYPE2CONST(Tango::DevBoolean,DEV_BOOLEAN)
--RANGES_TYPE2CONST(Tango::DevString,DEV_STRING)
--RANGES_TYPE2CONST(Tango::DevState,DEV_STATE)
--
- //
- // A classical function which will be used as unary predicate for the find_if
- // algo. It must be used with the bind2nd adapter to be transform as unary and
-@@ -4696,49 +4681,6 @@ void Attribute::set_upd_properties(const AttributeConfig_3 &conf,string &dev_nam
- }
- }
-
--void Attribute::set_min_alarm(char *new_min_alarm_str)
--{
-- set_min_alarm(string(new_min_alarm_str));
--}
--
--void Attribute::set_min_alarm(const char *new_min_alarm_str)
--{
-- set_min_alarm(string(new_min_alarm_str));
--}
--
--
--void Attribute::set_max_alarm(char *new_max_alarm_str)
--{
-- set_max_alarm(string(new_max_alarm_str));
--}
--
--void Attribute::set_max_alarm(const char *new_max_alarm_str)
--{
-- set_max_alarm(string(new_max_alarm_str));
--}
--
--
--void Attribute::set_min_warning(char *new_min_warning_str)
--{
-- set_min_warning(string(new_min_warning_str));
--}
--
--void Attribute::set_min_warning(const char *new_min_warning_str)
--{
-- set_min_warning(string(new_min_warning_str));
--}
--
--
--void Attribute::set_max_warning(char *new_max_warning_str)
--{
-- set_max_warning(string(new_max_warning_str));
--}
--
--void Attribute::set_max_warning(const char *new_max_warning_str)
--{
-- set_max_warning(string(new_max_warning_str));
--}
--
- //--------------------------------------------------------------------------------------------------------------------
- //
- // method :
-diff --git a/lib/cpp/server/w_attribute.cpp b/lib/cpp/server/w_attribute.cpp
-index 6fbffd2..f3ed3bb 100644
---- a/lib/cpp/server/w_attribute.cpp
-+++ b/lib/cpp/server/w_attribute.cpp
-@@ -63,6 +63,64 @@ static const char *RcsId = "$Id: w_attribute.cpp 22302 2013-03-22 08:28:27Z taur
- namespace Tango
- {
-
-+ RANGES_TYPE2CONST(Tango::DevDouble,DEV_DOUBLE)
-+ RANGES_TYPE2CONST(Tango::DevFloat,DEV_FLOAT)
-+ RANGES_TYPE2CONST(Tango::DevLong,DEV_LONG)
-+ RANGES_TYPE2CONST(Tango::DevLong64,DEV_LONG64)
-+ RANGES_TYPE2CONST(Tango::DevShort,DEV_SHORT)
-+ RANGES_TYPE2CONST(Tango::DevUChar,DEV_UCHAR)
-+ RANGES_TYPE2CONST(Tango::DevULong,DEV_ULONG)
-+ RANGES_TYPE2CONST(Tango::DevULong64,DEV_ULONG64)
-+ RANGES_TYPE2CONST(Tango::DevUShort,DEV_USHORT)
-+ RANGES_TYPE2CONST(Tango::DevEncoded,DEV_ENCODED)
-+
-+ RANGES_TYPE2CONST(Tango::DevBoolean,DEV_BOOLEAN)
-+ RANGES_TYPE2CONST(Tango::DevString,DEV_STRING)
-+ RANGES_TYPE2CONST(Tango::DevState,DEV_STATE)
-+
-+ void Attribute::set_min_alarm(char *new_min_alarm_str)
-+ {
-+ set_min_alarm(string(new_min_alarm_str));
-+ }
-+
-+ void Attribute::set_min_alarm(const char *new_min_alarm_str)
-+ {
-+ set_min_alarm(string(new_min_alarm_str));
-+ }
-+
-+
-+ void Attribute::set_max_alarm(char *new_max_alarm_str)
-+ {
-+ set_max_alarm(string(new_max_alarm_str));
-+ }
-+
-+ void Attribute::set_max_alarm(const char *new_max_alarm_str)
-+ {
-+ set_max_alarm(string(new_max_alarm_str));
-+ }
-+
-+
-+ void Attribute::set_min_warning(char *new_min_warning_str)
-+ {
-+ set_min_warning(string(new_min_warning_str));
-+ }
-+
-+ void Attribute::set_min_warning(const char *new_min_warning_str)
-+ {
-+ set_min_warning(string(new_min_warning_str));
-+ }
-+
-+
-+ void Attribute::set_max_warning(char *new_max_warning_str)
-+ {
-+ set_max_warning(string(new_max_warning_str));
-+ }
-+
-+ void Attribute::set_max_warning(const char *new_max_warning_str)
-+ {
-+ set_max_warning(string(new_max_warning_str));
-+ }
-+
- //+-------------------------------------------------------------------------
- //
- // method : WAttribute::WAttribute
diff --git a/debian/patches/cxx11 b/debian/patches/cxx11
deleted file mode 100644
index d6aa1d5..0000000
--- a/debian/patches/cxx11
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- tango (8.1.2c+dfsg-6) unstable; urgency=medium
- .
- * Bump Standards-Version to 3.9.6 (nothing to do)
- * debian/control
- + Updated Vcs-Git
- * debian/patches
- + 0009-fix-gcc5-compilation.patch (Closes: #797285)
- * GCC5 transistion
- - Rename liblog4tango5 to liblog4tango5v5, triggered by the libstdc++6
- - Rename libtango8 to libtango8v5, triggered by the libstdc++6
- transition.
- - Add Conflict/Replaces with the old libraries.
- - Rename liblog4tango5-dbg to liblog4tango5v5-dbg.
- - Rename libtango8-dbg to libtango8v5-dbg.
-Author: Picca Frédéric-Emmanuel <picca at debian.org>
-Bug-Debian: https://bugs.debian.org/797285
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- tango-8.1.2c+dfsg.orig/lib/cpp/server/tango_const.h
-+++ tango-8.1.2c+dfsg/lib/cpp/server/tango_const.h
-@@ -950,18 +950,23 @@ typedef struct _OptAttrProp
-
-
- // Ranges type-enum-string conversions
-+#ifdef _GLIBCXX_USE_CXX11_ABI
-+#define TANGO_CXX11_ABI __attribute((abi_tag("cxx11")))
-+#else
-+#define TANGO_CXX11_ABI
-+#endif
-
- template <typename T>
- struct ranges_type2const
- {
- static CmdArgType enu;
-- static string str;
-+ static TANGO_CXX11_ABI string str;
- };
-
- template <CmdArgType>
- struct ranges_const2type
- {
-- static string str;
-+ static TANGO_CXX11_ABI string str;
- };
-
- #define RANGES_TYPE2CONST(type,constant) \
-@@ -969,17 +974,17 @@ struct ranges_const2type
- struct ranges_type2const<type> \
- { \
- static CmdArgType enu; \
-- static string str; \
-+ static TANGO_CXX11_ABI string str; \
- }; \
- CmdArgType ranges_type2const<type>::enu = constant; \
-- string ranges_type2const<type>::str = #type; \
-+ TANGO_CXX11_ABI string ranges_type2const<type>::str = #type; \
- template<> \
- struct ranges_const2type<Tango::constant> \
- { \
- typedef type Type; \
-- static string str; \
-+ static TANGO_CXX11_ABI string str; \
- }; \
-- string ranges_const2type<Tango::constant>::str = #type;
-+ TANGO_CXX11_ABI string ranges_const2type<Tango::constant>::str = #type;
-
- /*
- * List of strings used by the API as the DevError reason field.
diff --git a/debian/patches/series b/debian/patches/series
index de3c9fb..651fcd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
0006-fix-upstream-p812_2.patch
0007-fix-upstream-p812_3.patch
0008-fix-upstream-p812_4.patch
-cxx11
+0009-fix-forwarded-upstream-gcc5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list