[libvirt] [PATCH] vbox: define DYNLIB_NAME for kFreeBSD

Similar to what Eric did for Cygwin it helps at least to compile without --without-vbox --- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 9719014..7809719 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -50,7 +50,7 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) # define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib" -- 1.7.10.4

On 05/30/2013 02:48 PM, Guido Günther wrote:
Similar to what Eric did for Cygwin it helps at least to compile without --without-vbox
Well, my patch for Cygwin was nak'd, so you probably ought to amend the commit message.
--- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
At any rate, this patch is okay to go in (even where the cygwin version wasn't).
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 9719014..7809719 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -50,7 +50,7 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
It might be worth using \-newline to break this long condition to fit in 80 columns.
# define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib"
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On Thu, May 30, 2013 at 02:59:56PM -0600, Eric Blake wrote:
On 05/30/2013 02:48 PM, Guido Günther wrote:
Similar to what Eric did for Cygwin it helps at least to compile without --without-vbox
Well, my patch for Cygwin was nak'd, so you probably ought to amend the commit message.
--- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
At any rate, this patch is okay to go in (even where the cygwin version wasn't).
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 9719014..7809719 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -50,7 +50,7 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
It might be worth using \-newline to break this long condition to fit in 80 columns.
Pushed including the line breaks. Thanks, -- Guido
# define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib"
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake
-
Guido Günther