[libvirt] [PATCH 1/4] build: yet another cgroup conditional compilation fix
Daniel P. Berrange
berrange at redhat.com
Mon Jul 29 15:09:56 UTC 2013
On Mon, Jul 29, 2013 at 08:53:35AM -0600, Eric Blake wrote:
> From: "Daniel P. Berrange" <berrange at redhat.com>
>
> Linking fails on FreeBSD:
> CCLD libvirt.la
> /usr/bin/ld: ./.libs/libvirt_util.a(libvirt_util_la-vircgroup.o):
> relocation R_X86_64_PC32 against `virCgroupPartitionEscape' can not be
> used when making a shared object; recompile with -fPIC
> /usr/bin/ld: final link failed: Bad value
>
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> src/util/vircgroup.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
> index 68ec953..f9007e3 100644
> --- a/src/util/vircgroup.c
> +++ b/src/util/vircgroup.c
> @@ -67,8 +67,6 @@ typedef enum {
> */
> } virCgroupFlags;
>
> -static int virCgroupPartitionEscape(char **path);
> -
> bool virCgroupAvailable(void)
> {
> bool ret = false;
> @@ -95,6 +93,10 @@ bool virCgroupAvailable(void)
> return ret;
> }
>
> +#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
> +
> +static int virCgroupPartitionEscape(char **path);
> +
> static bool
> virCgroupValidateMachineGroup(virCgroupPtr group,
> const char *name,
> @@ -149,7 +151,16 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
> VIR_FREE(partname);
> return valid;
> }
> -
> +#else
> +static bool
> +virCgroupValidateMachineGroup(virCgroupPtr group ATTRIBUTE_UNUSED,
> + const char *name ATTRIBUTE_UNUSED,
> + const char *drivername ATTRIBUTE_UNUSED,
> + bool stripEmulatorSuffix ATTRIBUTE_UNUSED)
> +{
> + return true;
> +}
> +#endif
>
> /**
> * virCgroupFree:
This won't apply to master, since I pushed my previous version of
the patch before you posted about the mingw32 problems
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
More information about the libvir-list
mailing list