From fb21f89b75d0152aa42efb6b620843799a4cd76b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 3 Jul 2012 15:22:05 -0400 Subject: [PATCH] sunrpc: fix rpc bootstrap builds If you build & install glibc w/rpc disabled, you no longer have headers in /usr/include/rpc/ (this is expected). But if you try to build glibc w/rpc enabled, this gets into a bad state due to the new rpc helpers that get cross-compiled: $ make ... x86_64-pc-linux-gnu-gcc -m32 -D_RPC_THREAD_SAFE_ -D_GNU_SOURCE -DIS_IN_build \ -include $objdir/config.h rpc_clntout.c -o $objdir/sunrpc/cross-rpc_clntout.o \ -MMD -MP -MF $objdir/sunrpc/cross-rpc_clntout.o.dt -MT $objdir/sunrpc/cross-rpc_clntout.o -c rpc_clntout.c:34:23: fatal error: rpc/types.h: No such file or directory compilation terminated. make: *** [$objdir/sunrpc/cross-rpc_clntout.o] Error 1 Signed-off-by: Mike Frysinger --- ChangeLog | 4 ++++ sunrpc/rpc_clntout.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 599399240f..b006d3f48a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-07-06 Mike Frysinger + + * sunrpc/rpc_clntout.c: Change to "rpc/types.h". + 2012-07-05 Joseph Myers [BZ #14157] diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c index ec040c775e..ce4d2a4c95 100644 --- a/sunrpc/rpc_clntout.c +++ b/sunrpc/rpc_clntout.c @@ -31,7 +31,7 @@ */ #include #include -#include +#include "rpc/types.h" #include "rpc_parse.h" #include "rpc_util.h" #include "proto.h"