On Tue, Feb 14, 2012 at 07:59:16PM +1100, Justin Clift wrote:
On 14/02/2012, at 7:31 PM, Daniel Veillard wrote:
> On Tue, Feb 14, 2012 at 07:18:32PM +1100, Justin Clift wrote:
>> On 14/02/2012, at 4:15 PM, Daniel Veillard wrote:
>>> As planned I made the release yesterday, it is tagged in git and
>>> available at:
>>>
ftp://libvirt.org/libvirt/
>>> both as tarball and signed rpms for Fedora 16.
>>
>> Ouch. This fails to compile on OSX (unlike rc1), with this:
>>
>> CCLD libvirt_iohelper
>> CCLD libvirt_driver_remote.la
>> ld: duplicate symbol _virFileWrapperFdFlags in
./.libs/libvirt_util.a(libvirt_util_la-virfile.o) and
./.libs/libvirt_util.a(libvirt_util_la-util.o) for architecture x86_64
>> collect2: ld returned 1 exit status
>>
>> I just went to download the rc's for this again, to verify rc1 still
compiles ok, just in case it's my system that's gone wrong.
Someone reported the bug as
https://bugzilla.redhat.com/show_bug.cgi?id=795076
and provied a patch for it, it makes sense, so I'm pushing it under
the build breaker rule.
Daniel
Author: Lincoln Myers <lincoln_myers(a)yahoo.com>
Fix compilation on MacOS X
* src/util/virfile.h: the virFileWrapperFdFlags being defined as
a globa variable instead of a type ended up generating a duplicate
symbol error.
* AUTHORS: added Lincoln Myers
diff --git a/AUTHORS b/AUTHORS
index 7a1fb63..7c2a6c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -220,6 +220,7 @@ Patches have also been contributed by:
Ansis Atteka <aatteka(a)nicira.com>
Dan Wendlandt <dan(a)nicira.com>
Kyle Mestery <kmestery(a)cisco.com>
+ Lincoln Myers <lincoln_myers(a)yahoo.com>
[....send patches to get your name here....]
diff --git a/src/util/virfile.h b/src/util/virfile.h
index ec1e90b..184677c 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -58,10 +58,10 @@ typedef virFileWrapperFd *virFileWrapperFdPtr;
int virFileDirectFdFlag(void);
-enum {
+enum virFileWrapperFdFlags {
VIR_FILE_WRAPPER_BYPASS_CACHE = (1 << 0),
VIR_FILE_WRAPPER_NON_BLOCKING = (1 << 1),
-} virFileWrapperFdFlags;
+};
virFileWrapperFdPtr virFileWrapperFdNew(int *fd,
const char *name,
--
Daniel Veillard | libxml Gnome XML XSLT toolkit
http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine
http://rpmfind.net/
http://veillard.com/ | virtualization library
http://libvirt.org/