dev-libs/boost/1.38.0: boost-1_38_0-haiku-gcc4-rev2.diff

boost/config/platform/haiku.hpp

@@ +1 @@
+//  (C) Copyright John Maddock 2001. 
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for most recent version.
+
+//  Haiku specific config options:
+
+#define BOOST_PLATFORM "Haiku"
+
+#define BOOST_NO_INTRINSIC_WCHAR_T
+#define BOOST_HAS_UNISTD_H
+
+#define BOOST_HAS_BETHREADS
+
+#ifndef BOOST_DISABLE_THREADS
+#  define BOOST_HAS_THREADS
+#endif
+
+//
+// thread API's not auto detected:
+//
+#define BOOST_HAS_GETTIMEOFDAY
+
+// boilerplate code:
+#include <boost/config/posix_features.hpp>
+ 
+
+

boost/config/select_platform_config.hpp

@@ -41 +41 @@
 // win32:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
 
+#elif defined(__HAIKU__)
+// Haiku
+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp"
+
 #elif defined(__BEOS__)
 // BeOS
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"

boost/config/stdlib/libstdcpp3.hpp

@@ -31 +31 @@
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) || defined(__HAIKU__)
       //
       // If the std lib has thread support turned on, then turn it on in Boost
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT

(a) clean vs. (b) pom2-boost/boost/thread/thread_time.hpp

@@ -17 +17 @@
     
     inline system_time get_system_time()
     {
+#ifndef BOOST_DATE_TIME_HAS_HIGH_PRECISION_CLOCK
+#       error "High precision clock not supported on this platform"
+#endif
         return boost::date_time::microsec_clock<system_time>::universal_time();
     }
 

tools/build/v2/tools/builtin.jam

@@ -38 +38 @@
 
 
 .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd
-    openbsd osf qnx qnxnto sgi solaris unix unixware windows ;
+    openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku ;
 
 # Feature used to determine which OS we're on. New <target-os> and <host-os>
 # features should be used instead.
@@ -70 +70 @@
             case MACOSX       : host-os = darwin  ;
             case KFREEBSD     : host-os = freebsd ;
             case LINUX        : host-os = linux   ;
+            case HAIKU        : host-os = haiku   ;
             case SUNOS        : 
               ECHO "SunOS is not a supported operating system." ;
               ECHO "We believe last version of SunOS was released in 1992, " ;

tools/build/v2/tools/gcc.jam

@@ -793 +793 @@
 # Differs from 'link' above only by -shared.
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -nostart -Wl,-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 }
 
 rule setup-threading ( targets * : sources * : properties * )
@@ -824 +824 @@
             {            
                 # BeOS has no threading options, so do not set anything here.
             }        
+            case haiku :
+            {
+                # pthread
+            }
             case *bsd :
             {
                 option = -pthread ;

tools/jam/src/Jambase

@@ -837 +837 @@
     NOARSCAN    ?= true ;
     STDHDRS     ?= /boot/develop/headers/posix ;
 }
-else if $(OS) = BEOS
+else if $(OS) = BEOS || $(OS) = HAIKU
 {
     BINDIR      ?= /boot/apps ;
     CC          ?= gcc ;

tools/jam/src/boehm_gc/config.guess

@@ -1199 +1199 @@
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
         exit ;;
+    BePC::Haiku:*:*)
+        echo i586-pc-beos
+        exit ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
         exit ;;

tools/jam/src/boehm_gc/include/private/gcconfig.h

@@ -215 +215 @@
 #    define BEOS
 #    define mach_type_known
 # endif
+# if defined(__HAIKU__) && defined(_X86_)
+#    define I386
+#    define HAIKU
+# endif
 # if defined(LINUX) && (defined(i386) || defined(__i386__))
 #    define I386
 #    define mach_type_known
@@ -1014 +1018 @@
       extern int etext[];
 #     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
 #   endif
+#   ifdef HAIKU
+#     define OS_TYPE "HAIKU"
+#     include <OS.h>
+#     define GETPAGESIZE() B_PAGE_SIZE
+      extern int etext[];
+#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
+#   endif
 #   ifdef SOLARIS
 #       define OS_TYPE "SOLARIS"
         extern int _etext[], _end[];

tools/jam/src/fileunix.c

@@ -80 +80 @@
 
 # if defined( OS_QNX ) || \
      defined( OS_BEOS ) || \
+     defined( OS_HAIKU ) || \
      defined( OS_MPEIX )
 # define NO_AR
 # define HAVE_AR

tools/jam/src/jam.h

@@ -234 +234 @@
     #define OS_BEOS
     #define NO_VFORK
 #endif
+#ifdef __HAIKU__
+   #define unix
+   #define OSMINOR "OS=HAIKU"
+   #define OS_HAIKU
+#endif
 #ifdef __bsdi__
     #define OSMINOR "OS=BSDI"
     #define OS_BSDI

tools/jam/src/jambase.c

@@ -542 +542 @@
 "NOARSCAN    ?= true ;\n",
 "STDHDRS     ?= /boot/develop/headers/posix ;\n",
 "}\n",
-"else if $(OS) = BEOS\n",
+"else if $(OS) = BEOS || $(OS) = HAIKU\n",
 "{\n",
 "BINDIR      ?= /boot/apps ;\n",
 "CC          ?= gcc ;\n",