[Pkg-corba-commits] r289 - in /trunk/omniorb/debian: changelog patches/hurd patches/series

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

Author: flub-guest
Date: Tue Sep 27 23:20:16 2011
New Revision: 289

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=289
Log:
Add fix for hurd build

Added:
    trunk/omniorb/debian/patches/hurd
Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/patches/series

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=289&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Tue Sep 27 23:20:16 2011
@@ -7,6 +7,7 @@
   * Add catior_manpage patch to fix minus sign instead of hyphen in
     the manual page.
   * Remove manpages included upstream from debian/
+  * Add patch for hurd FTBFS, thanks Pino Toscano (Closes: #641571)
 
  -- Floris Bruynooghe <flub at devork.be>  Thu, 21 Jul 2011 01:10:27 +0100
 

Added: trunk/omniorb/debian/patches/hurd
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/hurd?rev=289&op=file
==============================================================================
--- trunk/omniorb/debian/patches/hurd (added)
+++ trunk/omniorb/debian/patches/hurd Tue Sep 27 23:20:16 2011
@@ -1,0 +1,43 @@
+Description: Support GNU/HURD
+Forwarded: no
+Author: Pino Toscano <pino at debian.org>
+Last-Update: 2011-09-28
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -204,6 +204,7 @@
+   *-*-netbsd*)   plat_name="NetBSD";   plat_def="__netbsd__";   os_v="1";;
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
+   *-*-sco*)      plat_name="OSR5";     plat_def="__osr5__";     os_v="5";;
++  *-*-gnu*)      plat_name="GNU";      plat_def="__hurd__" ;    os_v="0";;
+ esac
+ 
+ AC_SUBST(PLATFORM_NAME, $plat_name)
+--- a/include/omnithread.h
++++ b/include/omnithread.h
+@@ -184,6 +184,9 @@
+ #elif defined(__Lynx__)
+ #include <omnithread/posix.h>
+ 
++#elif defined(__GNU__)
++#include <omnithread/posix.h>
++
+ #else
+ #error "No implementation header file"
+ #endif
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -775,6 +775,13 @@
+ endif
+ 
+ ###################
++ifdef GNU
++OMNITHREAD_POSIX_CPPFLAGS = -DPthreadDraftVersion=10
++OMNITHREAD_CPPFLAGS = -D_REENTRANT -pthread
++OMNITHREAD_LIB += -lpthread
++endif
++
++###################
+ ifdef SunOS
+ IMPORT_CPPFLAGS += -D__sunos__
+ OMNITHREAD_POSIX_CPPFLAGS = -DPthreadDraftVersion=10 \

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=289&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Tue Sep 27 23:20:16 2011
@@ -7,3 +7,4 @@
 spurious_hashbang
 set_ipv6_v6only_to_0
 catior_manpage
+hurd