about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-07-03 15:22:05 -0400
committerMike Frysinger <vapier@gentoo.org>2012-07-06 00:37:42 -0400
commitfb21f89b75d0152aa42efb6b620843799a4cd76b (patch)
tree96587bd1d0f6ae8758c88b5508da13062fe6e6d8
parentc57a67e03368687fc0d2ae8354cd1b347a61ea44 (diff)
downloadglibc-fb21f89b75d0152aa42efb6b620843799a4cd76b.tar.gz
glibc-fb21f89b75d0152aa42efb6b620843799a4cd76b.tar.xz
glibc-fb21f89b75d0152aa42efb6b620843799a4cd76b.zip
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 <vapier@gentoo.org>
-rw-r--r--ChangeLog4
-rw-r--r--sunrpc/rpc_clntout.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 599399240f..b006d3f48a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* sunrpc/rpc_clntout.c: Change <rpc/types.h> to "rpc/types.h".
+
 2012-07-05  Joseph Myers  <joseph@codesourcery.com>
 
 	[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 <stdio.h>
 #include <string.h>
-#include <rpc/types.h>
+#include "rpc/types.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
 #include "proto.h"