pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Substitute for LDCONFIG_ADD_CMD and LDCONFIG_REMOVE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a5d5ab334d9
branches:  trunk
changeset: 363391:0a5d5ab334d9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 07 20:24:19 2017 +0000

description:
Substitute for LDCONFIG_ADD_CMD and LDCONFIG_REMOVE_CMD in scripts.

LDCONFIG_ADD_CMD and LDCONFIG_REMOVE_CMD are set by emulator/*.mk
in order to update the library search paths in the emulated system
directories.  Substitute for those values, but default them to the
empty string so that the default action taken by the "shlibs" task
can be used.

diffstat:

 mk/pkgformat/pkg/templates/header |   6 +++++-
 mk/pkgtasks/shlibs.mk             |  15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r c7fcd47578af -r 0a5d5ab334d9 mk/pkgformat/pkg/templates/header
--- a/mk/pkgformat/pkg/templates/header Wed Jun 07 20:24:09 2017 +0000
+++ b/mk/pkgformat/pkg/templates/header Wed Jun 07 20:24:19 2017 +0000
@@ -29,7 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $NetBSD: header,v 1.2 2017/06/07 20:24:01 jlam Exp $
+# $NetBSD: header,v 1.3 2017/06/07 20:24:19 jlam Exp $
 
 # Package task loader.
 : ${TASK_MODULE_DIR:=@LOCALBASE@/share/pkgtasks-1}
@@ -130,6 +130,10 @@
 # Variables for the local state directory.
 VARBASE="@VARBASE@"
 
+# Variables for updating the library search paths cache.
+LDCONFIG_ADD_CMD="@LDCONFIG_ADD_CMD@"
+LDCONFIG_REMOVE_CMD="@LDCONFIG_REMOVE_CMD@"
+
 # The current working directory from which the script was invoked.
 CURDIR=$( ${PWD_CMD} )
 
diff -r c7fcd47578af -r 0a5d5ab334d9 mk/pkgtasks/shlibs.mk
--- a/mk/pkgtasks/shlibs.mk     Wed Jun 07 20:24:09 2017 +0000
+++ b/mk/pkgtasks/shlibs.mk     Wed Jun 07 20:24:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shlibs.mk,v 1.1 2017/06/01 02:06:04 jlam Exp $
+# $NetBSD: shlibs.mk,v 1.2 2017/06/07 20:24:19 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,6 +38,19 @@
 _USER_VARS.pkgtasks+=  RUN_LDCONFIG
 RUN_LDCONFIG?=         ${"${SHLIB_TYPE}" == "a.out":?yes:no}
 
+# LDCONFIG_ADD_CMD
+# LDCONFIG_REMOVE_CMD
+#      Command-lines to be invoked to update the library search paths
+#      cache when adding or removing a package.
+#
+#      Possible: any valid shell command-line
+#      Default: empty
+#
+LDCONFIG_ADD_CMD?=     # empty
+LDCONFIG_REMOVE_CMD?=  # empty
+FILES_SUBST+=          LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
+FILES_SUBST+=          LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
+
 # Trigger pkgtasks dependency if needed.
 .if "${RUN_LDCONFIG:tl}" == "yes"
 USE_PKGTASKS=          yes



Home | Main Index | Thread Index | Old Index