[Pkg-ace-devel] r415 - in /trunk/debian: config/config.h patches/00list patches/20-check-_REENTRANT.dpatch

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Tue Sep 12 19:00:20 2006
New Revision: 415

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=415
Log:
Attempt to fix #380739.

Added:
    trunk/debian/patches/20-check-_REENTRANT.dpatch   (with props)
Modified:
    trunk/debian/config/config.h
    trunk/debian/patches/00list

Modified: trunk/debian/config/config.h
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/config/config.h?rev=415&op=diff
==============================================================================
--- trunk/debian/config/config.h (original)
+++ trunk/debian/config/config.h Tue Sep 12 19:00:20 2006
@@ -1,5 +1,9 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
+
+#ifndef _REENTRANT
+#error _REENTRANT has to be defined!
+#endif
 
 // bossekr at debian.org: Get the system capabilities.
 #include <unistd.h>

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/00list?rev=415&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Tue Sep 12 19:00:20 2006
@@ -2,6 +2,7 @@
 15-fix-fltk-include
 16-g++4-visibility-tweaks
 20-debian-compiler-definitions
+20-check-_REENTRANT
 21-always-inline
 22-PortableGroup-compilation-fix
 23-PortableGroup-exceptions-propagation

Added: trunk/debian/patches/20-check-_REENTRANT.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/20-check-_REENTRANT.dpatch?rev=415&op=file
==============================================================================
--- trunk/debian/patches/20-check-_REENTRANT.dpatch (added)
+++ trunk/debian/patches/20-check-_REENTRANT.dpatch Tue Sep 12 19:00:20 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-check-_REENTRANT.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rather than #defining _REENTRANT if it's not yet defined, #error out
+## DP: See Debian bug #380739.
+
+ at DPATCH@
+--- ACE_wrappers.orig/ace/config-lite.h 	2006-09-10 21:51:38.312980000 +0200
++++ ACE_wrappers/ace/config-lite.h 	2006-09-10 21:36:50.861517750 +0200
+@@ -68,7 +68,7 @@
+ # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+ #   define ACE_MT(X) X
+ #   if !defined (_REENTRANT)
+-#     define _REENTRANT
++#     error _REENTRANT has to be defined!
+ #   endif /* _REENTRANT */
+ # else
+ #   define ACE_MT(X)

Propchange: trunk/debian/patches/20-check-_REENTRANT.dpatch
------------------------------------------------------------------------------
    svn:executable = *