Update bpkg test to be able to specify C++ compiler

3 files changed, 45 insertions, 1 deletions

diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
index 4903a33..40b3222 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile
@@ -3,6 +3,12 @@ lib{hello}: {hxx cxx}{hello}
 cxx.poptions += -I$src_root
 lib{hello}: cxx.export.poptions = -I$src_root
 
+liba{butl}: cxx.export.poptions += -DLIBHELLO_STATIC
+libs{butl}: cxx.export.poptions += -DLIBHELLO_SHARED
+
+obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
+
 # Install into the hello/ subdirectory of, say, /usr/include/.
 #
 install.include = $install.include/hello
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export
new file mode 100644
index 0000000..2da8177
--- /dev/null
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export
@@ -0,0 +1,36 @@
+// file: hello/export -*- C++ -*-
+
+#pragma once
+
+// 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/import 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.
+
+#if defined(LIBHELLO_STATIC)         // Using static.
+#  define LIBHELLO_EXPORT
+#elif defined(LIBHELLO_STATIC_BUILD) // Building static.
+#  define LIBHELLO_EXPORT
+#elif defined(LIBHELLO_SHARED)       // Using shared.
+#  ifdef _WIN32
+#    define LIBHELLO_EXPORT __declspec(dllimport)
+#  else
+#    define LIBHELLO_EXPORT
+#  endif
+#elif defined(LIBHELLO_SHARED_BUILD) // Building shared.
+#  ifdef _WIN32
+#    define LIBHELLO_EXPORT __declspec(dllexport)
+#  else
+#    define LIBHELLO_EXPORT
+#  endif
+#else
+// If none of the above macros are defined, then we assume we are being using
+// 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 LIBHELLO_EXPORT            // Using static or shared.
+#endif
diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
index 4f85114..5fb7d9e 100644
--- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
+++ b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello
@@ -4,8 +4,10 @@
 
 #include <string>
 
+#include <hello/export>
+
 namespace hello
 {
-  void
+  LIBHELLO_EXPORT void
   say (const std::string& name);
 }