External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: generalize solution for VPATH builds

Browse Source 
Commit 5d4b0c4c80 tried to fix certain classes of VPATH builds,
but was too limited.  In particular, Guannan Ren reported:

>    For example: The libvirt source code resides in /home/testuser,
>                 I make dist in /tmp/buildvpath, the XDR routine .c file will
>                 include full path of the header file like:
>
>                 #include "/home/testuser/src/rpc/virnetprotocol.h"
>                 #include "internal.h"
>                 #include <arpa/inet.h>
>
>    If we distribute the tarball to another machine to compile,
>    it will report error as follows:
>
>    rpc/virnetprotocol.c:7:59: fatal error:
>    /home/testuser/src/rpc/virnetprotocol.h: No such file or directory

* src/rpc/genprotocol.pl: Fix more include lines.
This commit is contained in:
Eric Blake 2012-03-06 13:49:53 -07:00
parent cdab483e92
commit 4d2e8355cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/genprotocol.pl
View File

@ -8,7 +8,7 @@
# actually fixes for 64 bit, so this file is necessary. Arguably # actually fixes for 64 bit, so this file is necessary. Arguably
# so is the type-punning fix. # so is the type-punning fix.
# #
# Copyright (C) 2007, 2011 Red Hat, Inc. # Copyright (C) 2007, 2011-2012 Red Hat, Inc.
# #
# See COPYING for the license of this software. # See COPYING for the license of this software.
# #
@ -53,13 +53,15 @@ while (<RPCGEN>) {
s/\t/ /g; s/\t/ /g;
# Fix VPATH builds
s,#include ".*/([^/]+)protocol\.h",#include "${1}protocol.h",;
# Portability for Solaris RPC # Portability for Solaris RPC
s/u_quad_t/uint64_t/g; s/u_quad_t/uint64_t/g;
s/quad_t/int64_t/g; s/quad_t/int64_t/g;
s/xdr_u_quad_t/xdr_uint64_t/g; s/xdr_u_quad_t/xdr_uint64_t/g;
s/xdr_quad_t/xdr_int64_t/g; s/xdr_quad_t/xdr_int64_t/g;
s/(?<!IXDR_GET_INT32 )IXDR_GET_LONG/IXDR_GET_INT32/g; s/(?<!IXDR_GET_INT32 )IXDR_GET_LONG/IXDR_GET_INT32/g;
s,#include ".*remote/remote_protocol\.h",#include "remote_protocol.h",;
if (m/^}/) { if (m/^}/) {
$in_function = 0; $in_function = 0;