[pkgsrc/pkgsrc-2005Q2]: pkgsrc/mk/compiler Pullup ticket 617 - requested by g...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3916edeade70
branches:  pkgsrc-2005Q2
changeset: 495907:3916edeade70
user:      snj <snj%pkgsrc.org@localhost>
date:      Wed Jul 27 05:05:46 2005 +0000

description:
Pullup ticket 617 - requested by grant beattie
infrastructure fix for sunpro

Revision pulled up:
- pkgsrc/mk/compiler/sunpro.mk  1.33

    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Thu Jul 21 01:36:25 UTC 2005

    Modified Files:
            pkgsrc/mk/compiler: sunpro.mk

    Log Message:
    some packages expect "-Wl," immediately before flags to be passed to
    the linker, set _COMPILER_RPATH_FLAG accordingly. "-Wl," is removed by
    the sunpro compiler wrapper where necessary.

    fix comment for _LINKER_RPATH_FLAG while here.

    this fixes, among other things, apache modules built with apxs.

diffstat:

 mk/compiler/sunpro.mk |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 2651f5698425 -r 3916edeade70 mk/compiler/sunpro.mk
--- a/mk/compiler/sunpro.mk     Wed Jul 27 04:57:20 2005 +0000
+++ b/mk/compiler/sunpro.mk     Wed Jul 27 05:05:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.32 2005/05/17 19:06:21 rillig Exp $
+# $NetBSD: sunpro.mk,v 1.32.2.1 2005/07/27 05:05:46 snj Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=    defined
@@ -32,11 +32,13 @@
 .endif
 _COMPILER_STRIP_VARS+= ${_SUNPRO_VARS}
 
-# SunPro passes rpath directives to the linker using "-R".
+# The Solaris linker uses "-R" for rpath directives.
 _LINKER_RPATH_FLAG=    -R
 
-# SunPro passes rpath directives to the linker using "-R".
-_COMPILER_RPATH_FLAG=  -R
+# SunPro passes rpath directives to the linker using "-R", however
+# some packages require the "-Wl," prefix to recognize linker options.
+# This is transformed by the compiler wrapper to "-R".
+_COMPILER_RPATH_FLAG=  -Wl,-R
 
 # SunPro compiler must be passed certain flags to compile/link 64-bit code.
 _COMPILER_ABI_FLAG.64= -xtarget=ultra -xarch=v9