diff options
Diffstat (limited to 'meta-pkgs/boost')
-rw-r--r-- | meta-pkgs/boost/distinfo | 10 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-aa | 26 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ad | 31 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ae | 13 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-af | 62 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ag | 12 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ah | 33 |
7 files changed, 162 insertions, 25 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 9ceb3b55166..682b81ac724 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.4 2005/08/12 20:58:45 jmmv Exp $ +$NetBSD: distinfo,v 1.5 2006/01/12 22:48:46 joerg Exp $ SHA1 (boost_1_33_0.tar.bz2) = be68cb1401ef4dbf8509685df0466429712a9d49 RMD160 (boost_1_33_0.tar.bz2) = e500524198780f89d041f4a539b8926bc3d6a0a6 Size (boost_1_33_0.tar.bz2) = 11356417 bytes -SHA1 (patch-aa) = 6f0b64da37de35b2b3d2eb5884608bd8f9a906fd +SHA1 (patch-aa) = 11391fd1bf1afbec16464b6aca91fbbb4af0c1a0 SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736 SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1 -SHA1 (patch-ad) = bb6441885c16a4ed11da76cb70acf0cc5ccc03fd +SHA1 (patch-ad) = f5ab062abdb23b0586d08aad843debf4d6162c87 +SHA1 (patch-ae) = c3242b8aa9a90c5659be5b22fa170310fe987e40 +SHA1 (patch-af) = e5a1fcd03b011b03064c5137e469d91b19cb9fe7 +SHA1 (patch-ag) = 296e28f361a9fd28bf9ca03733fe75206d405a1d +SHA1 (patch-ah) = e16c08bb0f63e63ae082e9d83c588e3adcf9cb3b diff --git a/meta-pkgs/boost/patches/patch-aa b/meta-pkgs/boost/patches/patch-aa index 54953e871cc..c7ef6ad2c21 100644 --- a/meta-pkgs/boost/patches/patch-aa +++ b/meta-pkgs/boost/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2005/02/26 22:48:34 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2006/01/12 22:48:46 joerg Exp $ --- tools/build/v1/gcc-tools.jam.orig 2004-10-19 17:12:58.000000000 +0200 +++ tools/build/v1/gcc-tools.jam @@ -15,12 +15,34 @@ $NetBSD: patch-aa,v 1.1 2005/02/26 22:48:34 jmmv Exp $ case *BSD : { flags gcc CFLAGS <threading>multi : -pthread ; -@@ -175,7 +181,7 @@ if $(UNIX) +@@ -175,7 +181,11 @@ if $(UNIX) SONAME = -Wl,-soname, ; flags gcc OBJCOPY_FLAGS <debug-symbols>on : "--set-section-flags .debug_str=contents,debug" ; } - case OpenBSD : + case *BSD : ++ { ++ SONAME = -Wl,-soname, ; ++ } ++ case DragonFly : { SONAME = -Wl,-soname, ; } +@@ -416,7 +426,7 @@ rule Link-action + LNOPT on $(<) = "" ; + } + # do we use sonames or not? +- if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) ++ if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + OUTTAG on $(<) = ".$(DLLVERSION)" ; + SOTAG on $(<) = ".$(DLLVERSION)" ; +@@ -462,7 +472,7 @@ rule Link-action + gcc-spawn $(<) ; + gcc-Link-action $(<) : $(>) ; + +- if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) ++ if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + return "$(<[1]).$(DLLVERSION)" ; + } diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad index 45f6236f9db..e6ae53911af 100644 --- a/meta-pkgs/boost/patches/patch-ad +++ b/meta-pkgs/boost/patches/patch-ad @@ -1,22 +1,13 @@ -$NetBSD: patch-ad,v 1.2 2005/08/12 20:58:45 jmmv Exp $ +$NetBSD: patch-ad,v 1.3 2006/01/12 22:48:46 joerg Exp $ ---- tools/build/v1/gcc-tools.jam.orig 2005-08-12 17:06:38.000000000 +0200 -+++ tools/build/v1/gcc-tools.jam -@@ -422,7 +422,7 @@ rule Link-action - LNOPT on $(<) = "" ; - } - # do we use sonames or not? -- if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) -+ if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) - { - OUTTAG on $(<) = ".$(DLLVERSION)" ; - SOTAG on $(<) = ".$(DLLVERSION)" ; -@@ -468,7 +468,7 @@ rule Link-action - gcc-spawn $(<) ; - gcc-Link-action $(<) : $(>) ; +--- boost/config/suffix.hpp.orig 2005-06-21 12:35:22.000000000 +0000 ++++ boost/config/suffix.hpp +@@ -213,7 +213,7 @@ + // from here then add to the appropriate compiler section): + // + #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \ +- || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS) ++ || defined(_PTHREADS) || defined(__DragonFly__)) && !defined(BOOST_HAS_THREADS) + # define BOOST_HAS_THREADS + #endif -- if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) -+ if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = DRAGONFLY || $(OS) = FREEBSD || $(OS) = LINUX || $(OS) = NETBSD || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) - { - return "$(<[1]).$(DLLVERSION)" ; - } diff --git a/meta-pkgs/boost/patches/patch-ae b/meta-pkgs/boost/patches/patch-ae new file mode 100644 index 00000000000..c75b7305164 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2006/01/12 22:48:46 joerg Exp $ + +--- boost/config/select_platform_config.hpp.orig 2005-12-30 15:53:04.000000000 +0000 ++++ boost/config/select_platform_config.hpp +@@ -17,7 +17,7 @@ + // linux: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp" + +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + // BSD: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp" + diff --git a/meta-pkgs/boost/patches/patch-af b/meta-pkgs/boost/patches/patch-af new file mode 100644 index 00000000000..3cee7f1217c --- /dev/null +++ b/meta-pkgs/boost/patches/patch-af @@ -0,0 +1,62 @@ +$NetBSD: patch-af,v 1.1 2006/01/12 22:48:46 joerg Exp $ + +--- boost/config/platform/bsd.hpp.orig 2005-12-30 15:54:15.000000000 +0000 ++++ boost/config/platform/bsd.hpp +@@ -9,11 +9,13 @@ + + // generic BSD config options: + +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #error "This platform is not BSD" + #endif + +-#ifdef __FreeBSD__ ++#ifdef __DragonFly__ ++#define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__) ++#elif defined(__FreeBSD__) + #define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__) + #elif defined(__NetBSD__) + #define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__) +@@ -21,12 +23,16 @@ + #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__) + #endif + ++#if defined(__DragonFly__) ++#define _REENTRANT 1 ++#endif ++ + // + // is this the correct version check? + // FreeBSD has <nl_types.h> but does not + // advertise the fact in <unistd.h>: + // +-#if defined(__FreeBSD__) && (__FreeBSD__ >= 3) ++#if defined(__DragonFly__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 3)) + # define BOOST_HAS_NL_TYPES_H + #endif + +@@ -34,20 +40,20 @@ + // FreeBSD 3.x has pthreads support, but defines _POSIX_THREADS in <pthread.h> + // and not in <unistd.h> + // +-#if defined(__FreeBSD__) && (__FreeBSD__ <= 3) ++#if defined(__DragonFly__) || defined(__FreeBSD__) && (__FreeBSD__ <= 3) + # define BOOST_HAS_PTHREADS + #endif + + // + // No wide character support in the BSD header files: + // +-#if !(defined(__FreeBSD__) && (__FreeBSD__ >= 5)) ++#if !((defined(__FreeBSD__) && (__FreeBSD__ >= 5))) && !defined(__DragonFly__) + # define BOOST_NO_CWCHAR + #endif + // + // The BSD <ctype.h> has macros only, no functions: + // +-#if !defined(__OpenBSD__) ++#if !defined(__OpenBSD__) && !defined(__DragonFly__) + # define BOOST_NO_CTYPE_FUNCTIONS + #endif + diff --git a/meta-pkgs/boost/patches/patch-ag b/meta-pkgs/boost/patches/patch-ag new file mode 100644 index 00000000000..85b074ba3a0 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2006/01/12 22:48:46 joerg Exp $ + +--- boost/integer_traits.hpp.orig 2005-12-30 16:19:19.000000000 +0000 ++++ boost/integer_traits.hpp +@@ -100,6 +100,7 @@ class integer_traits<wchar_t> + || (defined(__OpenBSD__) && defined(__GNUC__))\ + || (defined(__NetBSD__) && defined(__GNUC__))\ + || (defined(__FreeBSD__) && defined(__GNUC__))\ ++ || (defined(__DragonFly__) && defined(__GNUC__))\ + || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT)) + // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int. + // - SGI MIPSpro with native library diff --git a/meta-pkgs/boost/patches/patch-ah b/meta-pkgs/boost/patches/patch-ah new file mode 100644 index 00000000000..8ad7606d91d --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ah @@ -0,0 +1,33 @@ +$NetBSD: patch-ah,v 1.1 2006/01/12 22:48:46 joerg Exp $ + +--- tools/build/jam_src/jam.h.orig 2006-01-12 21:30:50.000000000 +0000 ++++ tools/build/jam_src/jam.h +@@ -250,8 +250,8 @@ + # define OS_FREEBSD + # endif + # ifdef __DragonFly__ +-# define OSMINOR "OS=DRAGONFLYBSD" +-# define OS_DRAGONFLYBSD ++# define OSMINOR "OS=DRAGONFLY" ++# define OS_DRAGONFLY + # endif + # ifdef __DGUX__ + # define OSMINOR "OS=DGUX" +@@ -415,7 +415,7 @@ + + # if !defined(OS_BSDI) && \ + !defined(OS_FREEBSD) && \ +- !defined(OS_DRAGONFLYBSD) && \ ++ !defined(OS_DRAGONFLY) && \ + !defined(OS_NEXT) && \ + !defined(OS_MACHTEN) && \ + !defined(OS_MACOSX) && \ +@@ -448,7 +448,7 @@ + defined( __i386__ ) || \ + defined( _M_IX86 ) + # if !defined( OS_FREEBSD ) && \ +- !defined( OS_DRAGONFLYBSD ) && \ ++ !defined( OS_DRAGONFLY ) && \ + !defined( OS_OS2 ) && \ + !defined( OS_AS400 ) + # define OSPLAT "OSPLAT=X86" |