pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Allow -L/usr/lib/* as NetBSD-current act...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f3eda9cf477
branches:  trunk
changeset: 466605:8f3eda9cf477
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 21 07:37:32 2004 +0000

description:
Allow -L/usr/lib/* as NetBSD-current actually has shared libraries there,
and we should allow these to pass untouched through the wrapper scripts.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r e2f0a5528dc8 -r 8f3eda9cf477 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 21 06:56:59 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 21 07:37:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.50 2004/01/19 12:34:54 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.51 2004/01/21 07:37:32 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -678,6 +678,7 @@
 _BLNK_MANGLE_DIRS+=    ${_BLNK_PASSTHRU_DIRS}
 _BLNK_MANGLE_DIRS+=    ${_BLNK_PASSTHRU_RPATHDIRS}
 _BLNK_MANGLE_DIRS+=    /usr/include
+_BLNK_MANGLE_DIRS+=    /usr/lib
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_MANGLE_DIRS+=    ${PREFIX}
 .endif
@@ -704,6 +705,7 @@
 _BLNK_PROTECT_DIRS+=   ${_BLNK_PASSTHRU_DIRS}
 
 _BLNK_UNPROTECT_DIRS+= /usr/include
+_BLNK_UNPROTECT_DIRS+= /usr/lib
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_UNPROTECT_DIRS+= ${PREFIX}
 .endif
@@ -723,10 +725,11 @@
 _BLNK_TRANSFORM+=      mangle:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}}
 .endfor
 #
-# Protect -I/usr/include/* from transformations (these aren't part of the
-# normal header search paths).
+# Protect -I/usr/include/* and -L/usr/lib/* from transformations (these
+# aren't part of the normal header or library search paths).
 #
 _BLNK_TRANSFORM+=      submangle:-I/usr/include:-I${_BLNK_MANGLE_DIR./usr/include}
+_BLNK_TRANSFORM+=      submangle:-L/usr/lib:-L${_BLNK_MANGLE_DIR./usr/lib}
 #
 # Change any buildlink directories in runtime library search paths into
 # the canonical actual installed paths.



Home | Main Index | Thread Index | Old Index