pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Linux's rpcgen has the location of cpp compil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/31b2170b32fc
branches:  trunk
changeset: 568189:31b2170b32fc
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Dec 07 02:36:51 2009 +0000

description:
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:

 mk/tools/rpcgen.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 2b0fec4cc062 -r 31b2170b32fc mk/tools/rpcgen.mk
--- a/mk/tools/rpcgen.mk        Mon Dec 07 01:29:52 2009 +0000
+++ b/mk/tools/rpcgen.mk        Mon Dec 07 02:36:51 2009 +0000
@@ -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_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}
 



Home | Main Index | Thread Index | Old Index