diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-18 18:01:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-18 18:01:02 +0000 |
| commit | 2d76049e1e2da22281921e8af8ad641535872781 (patch) | |
| tree | d694e70403073f0ddd81b4ae67afbd219db4a5b4 /mk/bsd.pkg.mk | |
| parent | 12d6ee2282d1db38c2a4160286df836df7e695f0 (diff) | |
| download | pkgsrc-2d76049e1e2da22281921e8af8ad641535872781.tar.gz | |
Add back a facility to rebuild the run-time library search paths database
on platforms that need it.
XXX Right now, if the platform needs it, then it runs for every package.
XXX This needs to be fixed to only run for packages that install shared
XXX libraries.
* Move mk/plist/shlib-type to mk/scripts.
* Move definition of SHLIB_TYPE from mk/plist/plist.mk to bsd.pkg.mk.
* Move inclusion of bsd.pkginstall.mk below bsd.tools.mk so that it
can use SHLIB_TYPE. This is necessary because SHLIB_TYPE's value
is the result of evaluating a command, and the command needs "TOOL"
definitions provided by bsd.tools.mk.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b39d9c57558..76f2491c3ea 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1912 2007/07/16 20:51:07 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1913 2007/07/18 18:01:02 jlam Exp $ # # This file is in the public domain. # @@ -354,9 +354,6 @@ OVERRIDE_DIRDEPTH?= 2 # .include "${.PARSEDIR}/alternatives.mk" -# INSTALL/DEINSTALL script framework -.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk" - # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree # of dependencies for building, and the current target. _PKGSRC_IN?= ===${SMART_MESSAGES:D> ${.TARGET} [${PKGNAME}${_PKGSRC_DEPS}] ===} @@ -441,6 +438,18 @@ USE_TOOLS+= tee tsort # Tools .include "${.PARSEDIR}/tools/bsd.tools.mk" +# SHLIB_TYPE +# The type of shared library supported by the platform. +# +SHLIB_TYPE= ${_SHLIB_TYPE_cmd:sh} +_SHLIB_TYPE_cmd= \ + ${SETENV} ECHO=${TOOLS_ECHO:Q} FILE_CMD=${TOOLS_FILE_CMD:Q} \ + TEST=${TOOLS_TEST:Q} PKG_INFO_CMD=${PKG_INFO_CMD:Q} \ + ${SH} ${PKGSRCDIR}/mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q} + +# INSTALL/DEINSTALL script framework +.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk" + # Barrier .include "${.PARSEDIR}/bsd.pkg.barrier.mk" |