diff options
| author | joerg <joerg@pkgsrc.org> | 2015-03-15 21:18:32 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-03-15 21:18:32 +0000 |
| commit | 92122d3ca71beb03d8e3711326c70a64a6b894ad (patch) | |
| tree | ea25586c208d1e35d5f9cd9753615b352b9294d8 /mk | |
| parent | da8fb72a9b70bc05d0cc444685bb7829823aae66 (diff) | |
| download | pkgsrc-92122d3ca71beb03d8e3711326c70a64a6b894ad.tar.gz | |
Drop special casing of rpath in /usr/lib, the change didn't really work
due to misspelling in the old wrapper case and for cwrappers, it creates
more problems than it fixes. If parts of /usr/lib should really be
preserved, they should be added explicitly as pass-thru directory.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 1abb6044b0d..dede51f62f1 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.233 2015/03/15 19:23:26 joerg Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.234 2015/03/15 21:18:32 joerg Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -993,14 +993,6 @@ _BLNK_TRANSFORM+= rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}} _CWRAPPERS_TRANSFORM+= R:${_dir_}:${_dir_} .endfor # -# Protect /usr/lib/* as they're all allowed to be specified for the -# runtime library search path. -# -.for _dir_ in ${SYSTEM_DEFAULT_RPATH:S/:/ /g} -_BLNK_TRANSFORM+= sub-rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir}} -_CWRAPPERS_TRANSFORM+= R:/usr/lib:/usr/lib -.endfor -# # Convert direct paths to static libraries and libtool archives in # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}. # |