summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordholland <dholland>2009-12-07 02:36:51 +0000
committerdholland <dholland>2009-12-07 02:36:51 +0000
commit688721d37a51df87c42721a35d51112ee59cffa4 (patch)
treee896627f0871f9a8e12bf411e9841f4c9ee7f054 /mk
parent0b7ccfc067a146ca78cd76dddc40eaf9c88bb8af (diff)
downloadpkgsrc-688721d37a51df87c42721a35d51112ee59cffa4.tar.gz
Linux's rpcgen has the location of cpp compiled in. Make it use the
pkgsrc wrapper by adding -Y ${WRAPPER_BINDIR:Q} when OPSYS is Linux. This will fix obscure/subtle build problems caused by bypassing the wrappers; it will also fix pkgsrc builds on improperly configured Linux distros (such as in PR pkg/41359) whose rpcgen has the wrong location for cpp compiled into it. While there are at least two main branches of rpcgen floating around the Linux world, both of them support '-Y cpp-path'.
Diffstat (limited to 'mk')
-rw-r--r--mk/tools/rpcgen.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/tools/rpcgen.mk b/mk/tools/rpcgen.mk
index 60e38e06827..eb93cc654af 100644
--- a/mk/tools/rpcgen.mk
+++ b/mk/tools/rpcgen.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rpcgen.mk,v 1.10 2005/07/17 23:19:04 jlam Exp $
+# $NetBSD: rpcgen.mk,v 1.11 2009/12/07 02:36:51 dholland Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -53,6 +53,8 @@ TOOLS_PATH.rpcgen?= ${FALSE}
TOOLS_CMD.rpcgen= ${TOOLS_DIR}/bin/rpcgen
.if ${OPSYS} == "NetBSD"
TOOLS_ARGS.rpcgen?= -b
+.elif ${OPSYS} == "Linux"
+TOOLS_ARGS.rpcgen?= -Y ${WRAPPER_BINDIR:Q}
.endif
TOOLS_SCRIPT.rpcgen= CPP=${WRAPPER_BINDIR:Q}/cpp ${TOOLS_SCRIPT_DFLT.rpcgen}