pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Putting bsd.pkginstall.mk under bsd.tools.mk was a ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c45e10f09817
branches: trunk
changeset: 531178:c45e10f09817
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jul 23 15:23:46 2007 +0000
description:
Putting bsd.pkginstall.mk under bsd.tools.mk was a bad idea -- the
former set several USE_TOOLS lines that were being missed by bsd.tools.mk.
Rearrange the +SHLIBS code so that bsd.tools.mk can now be included
after bsd.pkginstall.mk again. The +SHLIBS code has now been moved
over to the plist module, which is so far the repository for all of
the shlib-type handling.
This should fix the problem with fonts handling being broken.
diffstat:
mk/bsd.pkg.mk | 17 +++----------
mk/pkginstall/bsd.pkginstall.mk | 32 +------------------------
mk/pkginstall/shlibs | 51 -----------------------------------------
mk/plist/plist.mk | 39 ++++++++++++++++++++++++++++++-
mk/plist/shlibs | 51 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 94 insertions(+), 96 deletions(-)
diffs (250 lines):
diff -r 5f07fe7b072b -r c45e10f09817 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon Jul 23 13:22:11 2007 +0000
+++ b/mk/bsd.pkg.mk Mon Jul 23 15:23:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1914 2007/07/20 14:25:03 rillig Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1915 2007/07/23 15:23:46 jlam Exp $
#
# This file is in the public domain.
#
@@ -432,24 +432,15 @@
USE_TOOLS+= tee tsort
.endif
+# INSTALL/DEINSTALL script framework
+.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
+
# Locking
.include "${.PARSEDIR}/internal/locking.mk"
# 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"
diff -r 5f07fe7b072b -r c45e10f09817 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk Mon Jul 23 13:22:11 2007 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk Mon Jul 23 15:23:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.27 2007/07/18 18:01:02 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.28 2007/07/23 15:23:47 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@@ -686,36 +686,6 @@
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
fi
-# LDCONFIG_ADD_CMD
-# LDCONFIG_REMOVE_CMD
-# Command-line to be invoked to update the system run-time library
-# search paths database when adding and removing a package.
-#
-# Default value: ${LDCONFIG}
-#
-LDCONFIG_ADD_CMD?= ${_LDCONFIG_ADD_CMD.${OPSYS}}
-LDCONFIG_REMOVE_CMD?= ${_LDCONFIG_REMOVE_CMD.${OPSYS}}
-_LDCONFIG_ADD_CMD.${OPSYS}?= ${LDCONFIG}
-_LDCONFIG_REMOVE_CMD.${OPSYS}?= ${LDCONFIG}
-FILES_SUBST+= LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
-FILES_SUBST+= LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
-
-.if ${SHLIB_TYPE} == "a.out"
-RUN_LDCONFIG?= yes
-.else
-RUN_LDCONFIG?= no
-.endif
-
-_INSTALL_SHLIBS_FILE= ${_PKGINSTALL_DIR}/shlibs
-.if !empty(RUN_LDCONFIG:M[Yy][Ee][Ss])
-_INSTALL_UNPACK_TMPL+= ${_INSTALL_SHLIBS_FILE}
-.endif
-
-${_INSTALL_SHLIBS_FILE}: ../../mk/pkginstall/shlibs
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shlibs > ${.TARGET}
-
# FONTS_DIRS.<type> are lists of directories in which the font databases
# are updated. If this is non-empty, then the appropriate tools is
# used to update the fonts database for the font type. The supported
diff -r 5f07fe7b072b -r c45e10f09817 mk/pkginstall/shlibs
--- a/mk/pkginstall/shlibs Mon Jul 23 13:22:11 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# $NetBSD: shlibs,v 1.5 2007/07/18 18:55:56 jlam Exp $
-#
-# Generate a +SHLIBS script that updates the system run-time library
-# search paths database for the package.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+SHLIBS)
- ${CAT} > ./+SHLIBS << 'EOF'
-#!@SH@
-#
-# +SHLIBS - system run-time library search paths database management script
-#
-# Usage: ./+SHLIBS ADD|REMOVE [metadatadir]
-#
-# This scripts rebuilds the system database of run-time library search
-# paths so that the system can find the shared libraries of the package
-# associated with <metadatadir>.
-#
-
-ECHO="@ECHO@"
-PWD_CMD="@PWD_CMD@"
-TRUE="@TRUE@"
-
-SELF=$0
-ACTION=$1
-
-CURDIR=`${PWD_CMD}`
-PKG_METADATA_DIR="${2-${CURDIR}}"
-: ${PKGNAME=${PKG_METADATA_DIR##*/}}
-: ${PKG_PREFIX=@PREFIX@}
-
-exitcode=0
-case $ACTION in
-ADD)
- ${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
- ( @LDCONFIG_ADD_CMD@ ) >/dev/null 2>&1 || ${TRUE}
- ;;
-
-REMOVE)
- ${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
- ( @LDCONFIG_REMOVE_CMD@ ) >/dev/null 2>&1 || ${TRUE}
- ;;
-esac
-exit $exitcode
-
-EOF
- ${SED} -n "/^\# SHLIBS: /p" ${SELF} >> ./+SHLIBS
- ${CHMOD} +x ./+SHLIBS
- ;;
-esac
-
diff -r 5f07fe7b072b -r c45e10f09817 mk/plist/plist.mk
--- a/mk/plist/plist.mk Mon Jul 23 13:22:11 2007 +0000
+++ b/mk/plist/plist.mk Mon Jul 23 15:23:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.27 2007/07/18 18:01:03 jlam Exp $
+# $NetBSD: plist.mk,v 1.28 2007/07/23 15:23:48 jlam Exp $
#
# This Makefile fragment handles the creation of PLISTs for use by
# pkg_create(8).
@@ -157,6 +157,13 @@
_SHLIB_AWKFILE.dylib= ${.CURDIR}/../../mk/plist/shlib-dylib.awk
_SHLIB_AWKFILE.none= ${.CURDIR}/../../mk/plist/shlib-none.awk
+# SHLIB_TYPE is 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} ${.CURDIR}/../../mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
+
######################################################################
# GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
@@ -251,3 +258,33 @@
${SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_INFO_AWK} | \
${AWK} '($$0 !~ "-[0-9]*(\\.gz)?$$") { print }'
.endif
+
+# LDCONFIG_ADD_CMD
+# LDCONFIG_REMOVE_CMD
+# Command-line to be invoked to update the system run-time library
+# search paths database when adding and removing a package.
+#
+# Default value: ${LDCONFIG}
+#
+LDCONFIG_ADD_CMD?= ${_LDCONFIG_ADD_CMD.${OPSYS}}
+LDCONFIG_REMOVE_CMD?= ${_LDCONFIG_REMOVE_CMD.${OPSYS}}
+_LDCONFIG_ADD_CMD.${OPSYS}?= ${LDCONFIG}
+_LDCONFIG_REMOVE_CMD.${OPSYS}?= ${LDCONFIG}
+FILES_SUBST+= LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
+FILES_SUBST+= LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
+
+.if ${SHLIB_TYPE} == "a.out"
+RUN_LDCONFIG?= yes
+.else
+RUN_LDCONFIG?= no
+.endif
+
+_INSTALL_SHLIBS_FILE= ${_PKGINSTALL_DIR}/shlibs
+.if !empty(RUN_LDCONFIG:M[Yy][Ee][Ss])
+_INSTALL_UNPACK_TMPL+= ${_INSTALL_SHLIBS_FILE}
+.endif
+
+${_INSTALL_SHLIBS_FILE}: ../../mk/plist/shlibs
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shlibs > ${.TARGET}
diff -r 5f07fe7b072b -r c45e10f09817 mk/plist/shlibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/plist/shlibs Mon Jul 23 15:23:46 2007 +0000
@@ -0,0 +1,51 @@
+# $NetBSD: shlibs,v 1.1 2007/07/23 15:23:48 jlam Exp $
+#
+# Generate a +SHLIBS script that updates the system run-time library
+# search paths database for the package.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+SHLIBS)
+ ${CAT} > ./+SHLIBS << 'EOF'
+#!@SH@
+#
+# +SHLIBS - system run-time library search paths database management script
+#
+# Usage: ./+SHLIBS ADD|REMOVE [metadatadir]
+#
+# This scripts rebuilds the system database of run-time library search
+# paths so that the system can find the shared libraries of the package
+# associated with <metadatadir>.
+#
+
+ECHO="@ECHO@"
+PWD_CMD="@PWD_CMD@"
+TRUE="@TRUE@"
+
+SELF=$0
+ACTION=$1
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_PREFIX=@PREFIX@}
+
+exitcode=0
+case $ACTION in
+ADD)
+ ${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
+ ( @LDCONFIG_ADD_CMD@ ) >/dev/null 2>&1 || ${TRUE}
+ ;;
+
+REMOVE)
+ ${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
+ ( @LDCONFIG_REMOVE_CMD@ ) >/dev/null 2>&1 || ${TRUE}
+ ;;
+esac
+exit $exitcode
+
+EOF
+ ${SED} -n "/^\# SHLIBS: /p" ${SELF} >> ./+SHLIBS
+ ${CHMOD} +x ./+SHLIBS
+ ;;
+esac
+
Home |
Main Index |
Thread Index |
Old Index