[SCM] tango branch, master, updated. debian/8.0.5+dfsg-2-2-g21c1c3d
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at debian.org
Wed May 29 05:32:31 UTC 2013
The following commit has been merged in the master branch:
commit 634f4f5c181639183b63a2d9c0d5c71cca3e3fd3
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue May 28 20:16:44 2013 +0200
try to fix the powerpc FTBFS
diff --git a/debian/patches/0007-upstream-attempt-to-fix-the-powerpc-FTBFS.patch b/debian/patches/0007-upstream-attempt-to-fix-the-powerpc-FTBFS.patch
new file mode 100644
index 0000000..ddb25d9
--- /dev/null
+++ b/debian/patches/0007-upstream-attempt-to-fix-the-powerpc-FTBFS.patch
@@ -0,0 +1,259 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Tue, 28 May 2013 20:15:57 +0200
+Subject: upstream attempt to fix the powerpc FTBFS
+
+---
+ lib/cpp/server/device.cpp | 2 +-
+ lib/cpp/server/device.h | 2 +-
+ lib/cpp/server/deviceclass.cpp | 2 +-
+ lib/cpp/server/deviceclass.h | 2 +-
+ lib/cpp/server/dserversignal.cpp | 43 ++++++++++----------------------------
+ lib/cpp/server/utils.cpp | 4 ----
+ 6 files changed, 15 insertions(+), 40 deletions(-)
+
+diff --git a/lib/cpp/server/device.cpp b/lib/cpp/server/device.cpp
+index b62085d..ab57e32 100644
+--- a/lib/cpp/server/device.cpp
++++ b/lib/cpp/server/device.cpp
+@@ -667,7 +667,7 @@ PortableServer::POA_ptr DeviceImpl::_default_POA()
+ //
+ //--------------------------------------------------------------------------
+
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ void DeviceImpl::register_signal(long signo,bool hand)
+ {
+ cout4 << "DeviceImpl::register_signal() arrived for signal " << signo << endl;
+diff --git a/lib/cpp/server/device.h b/lib/cpp/server/device.h
+index 38829a7..9faa36c 100644
+--- a/lib/cpp/server/device.h
++++ b/lib/cpp/server/device.h
+@@ -3264,7 +3264,7 @@ public:
+ /**@name Signal related methods
+ * These methods allow a signal management at device level */
+ //@{
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ /**
+ * Register a signal to be executed in a signal handler.
+ *
+diff --git a/lib/cpp/server/deviceclass.cpp b/lib/cpp/server/deviceclass.cpp
+index bf03fd1..138b36d 100644
+--- a/lib/cpp/server/deviceclass.cpp
++++ b/lib/cpp/server/deviceclass.cpp
+@@ -820,7 +820,7 @@ void DeviceClass::delete_dev(long idx,Tango::Util *tg,PortableServer::POA_ptr r_
+ //
+ //--------------------------------------------------------------------------
+
+-#if !(defined __linux)
++#if defined _TG_WINDOWS_
+ void DeviceClass::register_signal(long signo)
+ {
+ cout4 << "DeviceClass::register_signal() arrived for signal " << signo << endl;
+diff --git a/lib/cpp/server/deviceclass.h b/lib/cpp/server/deviceclass.h
+index 5f80858..4604478 100644
+--- a/lib/cpp/server/deviceclass.h
++++ b/lib/cpp/server/deviceclass.h
+@@ -256,7 +256,7 @@ public:
+ /**@name Signal related methods
+ * These methods allow a signal management at device level */
+ //@{
+-#if !(defined __linux)
++#if defined _TG_WINDOWS_
+ /**
+ * Register a signal.
+ *
+diff --git a/lib/cpp/server/dserversignal.cpp b/lib/cpp/server/dserversignal.cpp
+index 48614a5..8c9a67a 100644
+--- a/lib/cpp/server/dserversignal.cpp
++++ b/lib/cpp/server/dserversignal.cpp
+@@ -217,10 +217,8 @@ DServerSignal::DServerSignal():TangoMonitor("signal")
+ sigdelset(&sigs_to_block,SIGSTOP);
+
+ sigdelset(&sigs_to_block,SIGTSTP);
+-#if (defined __linux)
+ sigdelset(&sigs_to_block,SIGUSR1);
+ sigdelset(&sigs_to_block,SIGUSR2);
+-#endif
+ sigprocmask(SIG_BLOCK,&sigs_to_block,NULL);
+ #else /* _TG_WINDOWS_ */
+ win_ev = CreateEvent(NULL,FALSE,FALSE,NULL);
+@@ -254,7 +252,7 @@ DServerSignal::DServerSignal():TangoMonitor("signal")
+ //
+ //-----------------------------------------------------------------------------
+
+-#if !(defined __linux)
++#if defined _TG_WINDOWS_
+ void DServerSignal::register_class_signal(long signo,DeviceClass *cl_ptr)
+ #else
+ void DServerSignal::register_class_signal(long signo,bool handler,DeviceClass *cl_ptr)
+@@ -283,7 +281,7 @@ void DServerSignal::register_class_signal(long signo,bool handler,DeviceClass *c
+ (const char *)"DServerSignal::register_class_signal");
+ }
+
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ if ((auto_signal(signo) == true) && (handler == true))
+ {
+ TangoSys_OMemStream o;
+@@ -303,8 +301,8 @@ void DServerSignal::register_class_signal(long signo,bool handler,DeviceClass *c
+ if ((reg_sig[signo].registered_devices.empty() == true) &&
+ (reg_sig[signo].registered_classes.empty() == true))
+ {
+-#if !(defined __linux)
+- register_handler(signo);
++#ifdef _TG_WINDOWS_
++ register_handler(signo);
+ #else
+ register_handler(signo,handler);
+ #endif
+@@ -321,7 +319,7 @@ void DServerSignal::register_class_signal(long signo,bool handler,DeviceClass *c
+ if (f == reg_sig[signo].registered_classes.end())
+ {
+ reg_sig[signo].registered_classes.push_back(cl_ptr);
+-#if (defined __linux)
++#ifndef _TG_WINDOWS
+ reg_sig[signo].own_handler = handler;
+ #endif
+ }
+@@ -364,7 +362,7 @@ vector<DeviceClass *>::iterator DServerSignal::find_class(long signo,DeviceClass
+ //
+ //-----------------------------------------------------------------------------
+
+-#if !(defined __linux)
++#ifdef _TG_WINDOWS_
+ void DServerSignal::register_dev_signal(long signo,DeviceImpl *dev_ptr)
+ #else
+ void DServerSignal::register_dev_signal(long signo,bool handler,DeviceImpl *dev_ptr)
+@@ -393,7 +391,7 @@ void DServerSignal::register_dev_signal(long signo,bool handler,DeviceImpl *dev_
+ (const char *)"DServerSignal::register_dev_signal");
+ }
+
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ if ((auto_signal(signo) == true) && (handler == true))
+ {
+ TangoSys_OMemStream o;
+@@ -413,7 +411,7 @@ void DServerSignal::register_dev_signal(long signo,bool handler,DeviceImpl *dev_
+ if ((reg_sig[signo].registered_devices.empty() == true) &&
+ (reg_sig[signo].registered_classes.empty() == true))
+ {
+-#if !(defined __linux)
++#ifdef _TG_WINDOWS_
+ register_handler(signo);
+ #else
+ register_handler(signo,handler);
+@@ -432,7 +430,7 @@ void DServerSignal::register_dev_signal(long signo,bool handler,DeviceImpl *dev_
+ if (f == reg_sig[signo].registered_devices.end())
+ {
+ reg_sig[signo].registered_devices.push_back(dev_ptr);
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ reg_sig[signo].own_handler = handler;
+ #endif
+ }
+@@ -672,7 +670,7 @@ void DServerSignal::unregister_class_signal(DeviceClass *cl_ptr)
+ //
+ //-----------------------------------------------------------------------------
+
+-#if !(defined __linux)
++#ifdef _TG_WINDOWS_
+ void DServerSignal::register_handler(long signo)
+ #else
+ void DServerSignal::register_handler(long signo,bool handler)
+@@ -690,7 +688,6 @@ void DServerSignal::register_handler(long signo,bool handler)
+ (const char *)"DServerSignal::register_handler");
+ }
+ #else
+- #if (defined __linux)
+ if (handler == true)
+ {
+ sigset_t sigs_to_unblock;
+@@ -723,8 +720,6 @@ void DServerSignal::register_handler(long signo,bool handler)
+ }
+ else
+ {
+- #endif
+- {
+ omni_mutex_lock sy(*this);
+
+ while(sig_to_install == true)
+@@ -736,9 +731,6 @@ void DServerSignal::register_handler(long signo,bool handler)
+ }
+
+ pthread_kill(sig_th->my_thread,SIGINT);
+- #if (defined __linux)
+- }
+- #endif
+ #endif
+
+ }
+@@ -769,7 +761,6 @@ void DServerSignal::unregister_handler(long signo)
+ (const char *)"DServerSignal::register_handler");
+ }
+ #else
+- #if (defined __linux)
+ if (reg_sig[signo].own_handler == true)
+ {
+ struct sigaction sa;
+@@ -789,8 +780,6 @@ void DServerSignal::unregister_handler(long signo)
+ }
+ else
+ {
+- #endif
+- {
+ omni_mutex_lock sy(*this);
+
+ while(sig_to_remove == true)
+@@ -802,13 +791,10 @@ void DServerSignal::unregister_handler(long signo)
+ }
+ pthread_kill(sig_th->my_thread,SIGINT);
+
+- #if (defined __linux)
+- }
+- #endif
+ #endif
+ }
+
+-#if (defined __linux)
++#ifndef _TG_WINDOWS_
+ pid_t DServerSignal::get_sig_thread_pid()
+ {
+ omni_mutex_lock syn(*this);
+@@ -834,7 +820,6 @@ pid_t DServerSignal::get_sig_thread_pid()
+ //-----------------------------------------------------------------------------
+
+ #ifndef _TG_WINDOWS_
+- #if (defined __linux)
+ void DServerSignal::main_sig_handler(int signo)
+ {
+ cout4 << "In main sig_handler !!!!" << endl;
+@@ -867,12 +852,6 @@ void DServerSignal::main_sig_handler(int signo)
+ }
+ }
+ }
+- #else
+-void DServerSignal::main_sig_handler(int signo)
+-{
+- cout4 << "In main sig_handler !!!!" << endl;
+-}
+- #endif
+ #else
+ void DServerSignal::main_sig_handler(int signo)
+ {
+diff --git a/lib/cpp/server/utils.cpp b/lib/cpp/server/utils.cpp
+index ad5cc81..4b3fd31 100644
+--- a/lib/cpp/server/utils.cpp
++++ b/lib/cpp/server/utils.cpp
+@@ -2316,11 +2316,7 @@ void Util::print_err_message(const char *err_mess,TANGO_UNUSED(Tango::MessBoxTyp
+ }
+ #else
+ cerr << err_mess << endl;
+-#ifdef __linux
+ _exit(-1);
+-#else
+- exit(-1);
+-#endif
+ #endif
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 0c3efc8..891144b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-upstream-fix-p805_1.patch
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
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list