pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/wrapper Teach the libtool wrapper about the same ty...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fa79fef5ab9
branches:  trunk
changeset: 489019:2fa79fef5ab9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 14 21:33:08 2005 +0000

description:
Teach the libtool wrapper about the same types of transformations that
the compiler wrapper already knows to do.  This should protect
"-install_name ..." from wrapper transformations within the libtool
wrapper on Darwin and fixes PR pkg/29215.

Software that properly use libtool don't pass an explicit "-install_name
..." because libtool always generates its own such argument when
building the (Darwin) shared library.  However, not every piece of
software, including the ones like lang/tcl that pkgsrc converted to
use libtool, will use libtool in the documented fashion.  Longer term,
those packages should be fixed properly, but we will still need the
libtool wrapper to avoid transforming arguments that the compiler
wrapper itself doesn't transform, e.g. for MIPSpro and -LANG:*.

diffstat:

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

diffs (25 lines):

diff -r 9925ce9e1659 -r 2fa79fef5ab9 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Mon Feb 14 21:33:02 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Mon Feb 14 21:33:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.19 2005/01/18 17:25:13 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.20 2005/02/14 21:33:08 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -245,6 +245,7 @@
 _WRAP_ARG_PP.CXX=      ${_WRAP_ARG_PP.CC}
 _WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CXX=   ${_WRAP_TRANSFORM.CC}
+_WRAP_ARG_PP.LIBTOOL=  ${_WRAP_ARG_PP.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Mmipspro-ucode)
@@ -294,6 +295,7 @@
 _WRAP_ARG_PP.CC=       ${WRAPPER_TMPDIR}/arg-pp-darwin-gcc
 _WRAP_ARG_PP.CXX=      ${_WRAP_ARG_PP.CC}
 _WRAP_ARG_PP.LD=       ${_WRAP_ARG_PP.CC}
+_WRAP_ARG_PP.LIBTOOL=  ${_WRAP_ARG_PP.CC}
 .elif ${OPSYS} == "UnixWare"
 _WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-unixware-gcc
 _WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}



Home | Main Index | Thread Index | Old Index