diff options
| author | jlam <jlam> | 2004-01-21 07:37:32 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-21 07:37:32 +0000 |
| commit | 2cb3c9bff7f7e7c3c18e05bd217e2d4f513ebae1 (patch) | |
| tree | 44595053c44e722045bfae7533bde88281707ed5 /mk/buildlink3 | |
| parent | 17dc4421aa78a98b9922162b717e87584dc105b6 (diff) | |
| download | pkgsrc-2cb3c9bff7f7e7c3c18e05bd217e2d4f513ebae1.tar.gz | |
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 (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 38671497bcf..ae26178e139 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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+= ${WRKDIR} _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+= ${WRKDIR} _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_UNPROTECT_DIRS+= ${BUILDLINK_DIR} _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. |