From 2364f5cb43fa7c14f95304c432b6e215e158c224 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 18 Feb 2019 13:02:02 +0200 Subject: Add support for building with build2 --- odb/boost/details/build2/config-stub.h | 6 +++++ odb/boost/details/build2/config-vc-stub.h | 6 +++++ odb/boost/details/build2/config-vc.h | 16 +++++++++++++ odb/boost/details/build2/config.h | 18 ++++++++++++++ odb/boost/details/config-vc.h | 6 +++++ odb/boost/details/config.hxx | 11 +++++---- odb/boost/details/export.hxx | 39 +++++++++++++++++++++++++++++++ 7 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 odb/boost/details/build2/config-stub.h create mode 100644 odb/boost/details/build2/config-vc-stub.h create mode 100644 odb/boost/details/build2/config-vc.h create mode 100644 odb/boost/details/build2/config.h create mode 100644 odb/boost/details/config-vc.h (limited to 'odb/boost/details') diff --git a/odb/boost/details/build2/config-stub.h b/odb/boost/details/build2/config-stub.h new file mode 100644 index 0000000..0b03d9b --- /dev/null +++ b/odb/boost/details/build2/config-stub.h @@ -0,0 +1,6 @@ +/* file : odb/boost/details/build2/config-stub.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include diff --git a/odb/boost/details/build2/config-vc-stub.h b/odb/boost/details/build2/config-vc-stub.h new file mode 100644 index 0000000..541cfba --- /dev/null +++ b/odb/boost/details/build2/config-vc-stub.h @@ -0,0 +1,6 @@ +/* file : odb/boost/details/build2/config-vc-stub.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include diff --git a/odb/boost/details/build2/config-vc.h b/odb/boost/details/build2/config-vc.h new file mode 100644 index 0000000..568c517 --- /dev/null +++ b/odb/boost/details/build2/config-vc.h @@ -0,0 +1,16 @@ +/* file : odb/boost/details/build2/config-vc.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef ODB_BOOST_DETAILS_CONFIG_VC_H +#define ODB_BOOST_DETAILS_CONFIG_VC_H + +/* Define LIBODB_BOOST_BUILD2 for the installed case. */ +#ifndef LIBODB_BOOST_BUILD2 +# define LIBODB_BOOST_BUILD2 +#endif + +#endif /* ODB_BOOST_DETAILS_CONFIG_VC_H */ diff --git a/odb/boost/details/build2/config.h b/odb/boost/details/build2/config.h new file mode 100644 index 0000000..7de8128 --- /dev/null +++ b/odb/boost/details/build2/config.h @@ -0,0 +1,18 @@ +/* file : odb/boost/details/build2/config.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. The installed case + (when LIBODB_BOOST_BUILD2 is not necessarily defined) is the only + reason we have it. */ + +#ifndef ODB_BOOST_DETAILS_CONFIG_H +#define ODB_BOOST_DETAILS_CONFIG_H + +/* Define LIBODB_BOOST_BUILD2 for the installed case. */ +#ifndef LIBODB_BOOST_BUILD2 +# define LIBODB_BOOST_BUILD2 +#endif + +#endif /* ODB_BOOST_DETAILS_CONFIG_H */ diff --git a/odb/boost/details/config-vc.h b/odb/boost/details/config-vc.h new file mode 100644 index 0000000..4212314 --- /dev/null +++ b/odb/boost/details/config-vc.h @@ -0,0 +1,6 @@ +/* file : odb/boost/details/config-vc.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Dummy configuration file for Windows/VC++. */ diff --git a/odb/boost/details/config.hxx b/odb/boost/details/config.hxx index bc9db32..a637f44 100644 --- a/odb/boost/details/config.hxx +++ b/odb/boost/details/config.hxx @@ -7,11 +7,14 @@ // no pre -#ifdef _MSC_VER -#elif defined(ODB_COMPILER) +#ifdef ODB_COMPILER # define LIBODB_BOOST_STATIC_LIB -#else -# include +#elif !defined(LIBODB_BOOST_BUILD2) +# ifdef _MSC_VER +# include +# else +# include +# endif #endif // no post diff --git a/odb/boost/details/export.hxx b/odb/boost/details/export.hxx index b5d4282..9b96a30 100644 --- a/odb/boost/details/export.hxx +++ b/odb/boost/details/export.hxx @@ -9,6 +9,43 @@ #include +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#ifdef LIBODB_BOOST_BUILD2 + +#if defined(LIBODB_BOOST_STATIC) // Using static. +# define LIBODB_BOOST_EXPORT +#elif defined(LIBODB_BOOST_STATIC_BUILD) // Building static. +# define LIBODB_BOOST_EXPORT +#elif defined(LIBODB_BOOST_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBODB_BOOST_EXPORT __declspec(dllimport) +# else +# define LIBODB_BOOST_EXPORT +# endif +#elif defined(LIBODB_BOOST_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBODB_BOOST_EXPORT __declspec(dllexport) +# else +# define LIBODB_BOOST_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBODB_BOOST_EXPORT // Using static or shared. +#endif + +#else // LIBODB_BOOST_BUILD2 + #ifdef LIBODB_BOOST_STATIC_LIB # define LIBODB_BOOST_EXPORT #else @@ -35,6 +72,8 @@ # endif #endif +#endif // LIBODB_BOOST_BUILD2 + #include #endif // ODB_BOOST_DETAILS_EXPORT_HXX -- cgit v1.1