diff options
| author | tv <tv@pkgsrc.org> | 2004-10-21 17:00:10 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-21 17:00:10 +0000 |
| commit | cff213b131dce9e91063eadaff86506354d5a79d (patch) | |
| tree | 58580de0b246f3cff593dd9d01a1cfcad698a66d | |
| parent | 4a2e41217f80d43a032634403b5c0eb30399d60c (diff) | |
| download | pkgsrc-cff213b131dce9e91063eadaff86506354d5a79d.tar.gz | |
Put back LIBTOOLIZE_PLIST, which I meant to do but didn't commit. This is
needed by some packages currently which install broken .la files or
otherwise don't work with the transform logic yet.
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9474467c151..7a9889590da 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1520 2004/10/16 22:37:29 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1521 2004/10/21 17:00:10 tv Exp $ # # This file is in the public domain. # @@ -4488,6 +4488,7 @@ _PRINT_PLIST_DIRS_CMD= \ _PRINT_LA_LIBNAMES= ${SETENV} ECHO=${ECHO:Q} GREP=${GREP:Q} SORT=${SORT:Q} \ ${SH} ${.CURDIR}/../../mk/scripts/print-la-libnames +.if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS]) _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ ( \ if ${TEST} -d ${WRKDIR}; then \ @@ -4512,6 +4513,9 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ fi; \ ${RM} -f "$$fileslist" "$$libslist"; \ ) +.else +_PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT} +.endif .PHONY: print-PLIST .if !target(print-PLIST) @@ -4959,10 +4963,12 @@ BEGIN { \ .if ${PLIST_TYPE} == "dynamic" _PLIST_AWK_LIBTOOL?= # empty .else +. if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS]) _PLIST_AWK_LIBTOOL?= \ /^[^@].*\.la$$/ { \ system("cd ${PREFIX} && ${_PRINT_LA_LIBNAMES} " $$0) \ } +. endif .endif # _PLIST_AWK_SCRIPT hold the complete awk script for plist target. diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b2718b66539..eb7d99de954 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.8 2004/10/12 13:58:22 tv Exp $ +# $NetBSD: mk.conf,v 1.9 2004/10/21 17:00:10 tv Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -257,6 +257,12 @@ FETCH_RESUME_ARGS?= # empty # Default: -R # Possible: depends on your FETCH_CMD value. +LIBTOOLIZE_PLIST?= yes +# This determines whether to expand libtool archives in PLISTs into the +# represented library names. +# Possible: yes, no +# Default: no + PKG_INSTALLATION_PREFS?= overwrite pkgviews # This is a whitespace-separated list of installation types to try when # building a package, in order of preference. |