Thu Nov 6 21:34:16 2008 UTC ()
Merge aix-xlc block into the xlc block and distinguish AIX and Darwin.
The PKG_FAIL_REASON isn't executed by default, no idea why, but this
makes it a bit cleaner why the compiler wrapper will fail and fixes the
more important AIX case.


(joerg)
diff -r1.77 -r1.78 pkgsrc/mk/wrapper/bsd.wrapper.mk
cvs diff -r1.77 -r1.78 pkgsrc/mk/wrapper/bsd.wrapper.mk (expand / switch to unified diff)

--- pkgsrc/mk/wrapper/bsd.wrapper.mk 2008/10/30 18:56:22 1.77
+++ pkgsrc/mk/wrapper/bsd.wrapper.mk 2008/11/06 21:34:16 1.78
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.wrapper.mk,v 1.77 2008/10/30 18:56:22 joerg Exp $ 1# $NetBSD: bsd.wrapper.mk,v 1.78 2008/11/06 21:34:16 joerg Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -220,32 +220,26 @@ _WRAP_BUILDCMD.${_wrappee_}?= ${_WRAP_B @@ -220,32 +220,26 @@ _WRAP_BUILDCMD.${_wrappee_}?= ${_WRAP_B
220_WRAP_CACHE.${_wrappee_}?= ${_WRAP_CACHE} 220_WRAP_CACHE.${_wrappee_}?= ${_WRAP_CACHE}
221_WRAP_CACHE_BODY.${_wrappee_}?= ${_WRAP_CACHE_BODY} 221_WRAP_CACHE_BODY.${_wrappee_}?= ${_WRAP_CACHE_BODY}
222_WRAP_CLEANUP.${_wrappee_}?= ${_WRAP_CLEANUP} 222_WRAP_CLEANUP.${_wrappee_}?= ${_WRAP_CLEANUP}
223_WRAP_CMD_SINK.${_wrappee_}?= ${_WRAP_CMD_SINK} 223_WRAP_CMD_SINK.${_wrappee_}?= ${_WRAP_CMD_SINK}
224_WRAP_LOG.${_wrappee_}?= ${_WRAP_LOG} 224_WRAP_LOG.${_wrappee_}?= ${_WRAP_LOG}
225_WRAP_LOGIC.${_wrappee_}?= ${_WRAP_LOGIC} 225_WRAP_LOGIC.${_wrappee_}?= ${_WRAP_LOGIC}
226_WRAP_SCAN.${_wrappee_}?= ${_WRAP_SCAN} 226_WRAP_SCAN.${_wrappee_}?= ${_WRAP_SCAN}
227_WRAP_TRANSFORM.${_wrappee_}?= ${_WRAP_TRANSFORM} 227_WRAP_TRANSFORM.${_wrappee_}?= ${_WRAP_TRANSFORM}
228_WRAP_TRANSFORM_SED.${_wrappee_}?= ${_WRAP_TRANSFORM_SED} 228_WRAP_TRANSFORM_SED.${_wrappee_}?= ${_WRAP_TRANSFORM_SED}
229_WRAP_SKIP_TRANSFORM.${_wrappee_}?= ${_WRAP_SKIP_TRANSFORM} 229_WRAP_SKIP_TRANSFORM.${_wrappee_}?= ${_WRAP_SKIP_TRANSFORM}
230_WRAP_TYPE.${_wrappee_}?= ${_wrappee_} 230_WRAP_TYPE.${_wrappee_}?= ${_wrappee_}
231.endfor # _WRAPPEES 231.endfor # _WRAPPEES
232 232
233.if !empty(PKGSRC_COMPILER:Maix-xlc) 
234_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc 
235_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC} 
236_WRAP_CMD_SINK.LD= ${_WRAP_CMD_SINK.CC} 
237.endif 
238 
239.if !empty(PKGSRC_COMPILER:Micc) 233.if !empty(PKGSRC_COMPILER:Micc)
240. if !empty(CC_VERSION:M8.1) || !empty(CC_VERSION:M9.0) 234. if !empty(CC_VERSION:M8.1) || !empty(CC_VERSION:M9.0)
241_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-icc81-cc 235_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-icc81-cc
242_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC} 236_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
243. else 237. else
244_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-icc-cc 238_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-icc-cc
245_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC} 239_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
246. endif 240. endif
247_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-icc-cc 241_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-icc-cc
248_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC} 242_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC}
249_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-icc-cc 243_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-icc-cc
250_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} 244_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
251.endif 245.endif
@@ -277,32 +271,40 @@ _WRAP_EXTRA_ARGS.CC+= -Xcpluscomm -Olimi @@ -277,32 +271,40 @@ _WRAP_EXTRA_ARGS.CC+= -Xcpluscomm -Olimi
277.if !empty(PKGSRC_COMPILER:Msunpro) 271.if !empty(PKGSRC_COMPILER:Msunpro)
278_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-sunpro-cc 272_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-sunpro-cc
279_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-sunpro-cc 273_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-sunpro-cc
280_WRAP_ARG_PP.CXX= ${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx 274_WRAP_ARG_PP.CXX= ${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx
281_WRAP_CACHE.CXX= ${WRAPPER_TMPDIR}/cache-sunpro-cxx 275_WRAP_CACHE.CXX= ${WRAPPER_TMPDIR}/cache-sunpro-cxx
282_WRAP_CACHE_BODY.CXX= ${WRAPPER_TMPDIR}/cache-body-sunpro-cxx 276_WRAP_CACHE_BODY.CXX= ${WRAPPER_TMPDIR}/cache-body-sunpro-cxx
283_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} 277_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
284_WRAP_CMD_SINK.CXX= ${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx 278_WRAP_CMD_SINK.CXX= ${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx
285_WRAP_CACHE_BODY.CPP= ${_WRAP_CACHE_BODY.CC} 279_WRAP_CACHE_BODY.CPP= ${_WRAP_CACHE_BODY.CC}
286_WRAP_TRANSFORM.CPP= ${_WRAP_TRANSFORM.CC} 280_WRAP_TRANSFORM.CPP= ${_WRAP_TRANSFORM.CC}
287.endif 281.endif
288 282
289.if !empty(PKGSRC_COMPILER:Mxlc) 283.if !empty(PKGSRC_COMPILER:Mxlc)
 284. if ${OPSYS} == "AIX"
 285_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc
 286_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
 287_WRAP_CMD_SINK.LD= ${_WRAP_CMD_SINK.CC}
 288. elif ${OPSYS} == "Darwin"
290_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-darwin-xlc 289_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-darwin-xlc
291_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC} 290_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
292_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-xlc-cc 291_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-xlc-cc
293_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-xlc-cc 292_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-xlc-cc
294_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC} 293_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC}
295_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} 294_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
 295. else
 296PKG_FAIL_REASON+= "xlc unsupported on ${OPSYS}"
 297. endif
296.endif 298.endif
297 299
298.if !empty(PKGSRC_COMPILER:Mccc) 300.if !empty(PKGSRC_COMPILER:Mccc)
299_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-ccc-cc 301_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-ccc-cc
300_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-ccc-cc 302_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-ccc-cc
301_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC} 303_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC}
302_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} 304_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
303.endif 305.endif
304 306
305.if !empty(PKGSRC_COMPILER:Mgcc) 307.if !empty(PKGSRC_COMPILER:Mgcc)
306_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-gcc 308_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-gcc
307_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} 309_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
308.endif 310.endif