diff options
| author | jlam <jlam@pkgsrc.org> | 2004-04-24 22:04:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-04-24 22:04:46 +0000 |
| commit | 419a7941e9aad3337c40db6e01e911a335adedf4 (patch) | |
| tree | 67c01c590cc58ef10e671b491e91c29f11d8f4ff /mk | |
| parent | 141780220288d664ee66e81da80fa696485a7947 (diff) | |
| download | pkgsrc-419a7941e9aad3337c40db6e01e911a335adedf4.tar.gz | |
Don't treat ${BUILDLINK_DIR} like a local directory in the "${WRKSRC} ==
${WRKDIR}" case when converting references to local libtool archives into
the full paths.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/libtool-post-cache | 7 | ||||
| -rw-r--r-- | mk/buildlink3/libtool-post-logic | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mk/buildlink3/libtool-post-cache b/mk/buildlink3/libtool-post-cache index 395267c3be7..e62e84dedfc 100644 --- a/mk/buildlink3/libtool-post-cache +++ b/mk/buildlink3/libtool-post-cache @@ -1,11 +1,14 @@ -# $NetBSD: libtool-post-cache,v 1.3 2004/03/30 17:25:19 jlam Exp $ +# $NetBSD: libtool-post-cache,v 1.4 2004/04/24 22:04:46 jlam Exp $ # # This file implements the default action of the "libtool" private # cache. # Skip the common cache lookup for all directories and library args that -# may reference a locally-linked libtool archive. +# may reference a locally-linked libtool archive. Avoid matching the +# buildlink directory here for the WRKSRC == WRKDIR case. # +-L${BUILDLINK_DIR}/*) + ;; -L.|-L./*|-L..*|-L[!/]*|-L${WRKSRC}*|-l*) skipcache=yes ;; diff --git a/mk/buildlink3/libtool-post-logic b/mk/buildlink3/libtool-post-logic index 4722f4933aa..21c33b5472e 100644 --- a/mk/buildlink3/libtool-post-logic +++ b/mk/buildlink3/libtool-post-logic @@ -1,4 +1,4 @@ -# $NetBSD: libtool-post-logic,v 1.6 2004/04/22 22:28:19 snj Exp $ +# $NetBSD: libtool-post-logic,v 1.7 2004/04/24 22:04:46 jlam Exp $ case $arg in # @@ -14,8 +14,11 @@ case $arg in # We convert the former into the latter by remembering all "local" # directories that are mentioned in -L* arguments to to libtool # wrapper, and checking to see if <dir>/libfoo.la exists when we see -# "-lfoo" on the libtool command line. +# "-lfoo" on the libtool command line. Avoid matching the buildlink +# directory here for the WRKSRC == WRKDIR case. # +-L${BUILDLINK_DIR}/*) + ;; -L.|-L./*|-L..*|-L[!/]*|-L${WRKSRC}*) case $fixlibpath in yes) |