Commit Graph

8 Commits

Author SHA1 Message Date
joerg 067600c8cf Revert last, it breaks the tricks xsrc uses. 2012-08-23 21:21:14 +00:00
joerg 8e96262375 Remove SHLIBINSTALLDIR and SHLINKINSTALLLIBDIR. Add rpath entries, if
SHLIBDIR differs from /usr/lib.
2012-08-23 15:45:02 +00:00
hira 02972af57d Use /libexec/ld.elf_so instead of /usr/libexec/ld.elf_so for the
programs which are located in /libexec.
2007-08-29 21:34:17 +00:00
jmmv abac724ef9 Also use libraries from /lib for binaries installed into /libexec. Needed
by lfs_cleanerd which is about to be moved to this directory.
2006-11-11 14:41:20 +00:00
lukem 337f8776b0 Also set SHLIBDIR to /lib if ${USE_SHLIBDIR} != "no".
This allows <bsd.lib.mk> to correctly set the RPATH of libraries that
use USE_SHLIBDIR=yes to /lib, so that dependent libraries can be found
from /lib when /usr/lib isn't mounted yet.
This was the intention of the _LIBLDOPTS support in <bsd.lib.mk>.

Fixes problem reported by Dan Carosone with when /sbin/cgdconfig is
dynamically linked against libcrypto.so but not libcrypt.so (it was
relying upon libcrypto.so to pull in libcrypt.so).
2005-03-12 13:21:12 +00:00
lukem 02e913d52d Consistently test all variables that support a "yes"/"no" value with
${VAR} == "no"
or
	${VAR} != "no"
(instead of against "yes").  Variables affected:
	TOOLCHAIN_MISSING
	HAVE_GCC3
	USE_TOOLS_TOOLCHAIN
	NEED_OWN_INSTALL_TARGET
	USE_SHLIBDIR

Improve the documentation.
2004-01-02 16:12:36 +00:00
lukem 5e2ad4afcc Be consistent how "multiple include protection" is implemented. I.e,
.if !defined(_BSD_foo_MK_)
	_BSD_foo_MK_=1

	# ...

	.endif	# !defined(_BSD_foo_MK_)
2003-07-28 02:38:33 +00:00
thorpej 09a0767aa9 Only use the MKDYNAMICROOT semantics (i.e. -rpath=/lib,/usr/lib and
-dynamic-linker=/libexec/ld.elf_so) if the BINDIR of the program being
built is /bin or /sbin.

The reason we do this is because now all programs *except* those in
/bin and /sbin (i.e. the "special cases") match the default the compiler
uses, which is what is used for things in e.g. xsrc, pkgsrc, and other
random 3rd party programs.

This is done by decoupling where a shlib is installed from how it
is located.  Two new variables, SHLIBINSTALLDIR and SHLINKINSTALLDIR,
contain the former information, and key off MKDYNAMICROOT only.  SHLIBDIR
and SHLINKDIR contain the latter, and key off MKDYNAMICROOT and BINDIR.

The SHLIBINSTALLDIR, SHLIBDIR, _LIBSODIR, SHLINKINSTALLDIR, and
SHLINKDIR parameters are moved to a new <bsd.shlib.mk>; see bsd.README
for usage details.
2002-09-27 21:37:50 +00:00