pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Don't match "bin/libtool" and symlink in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2496bf186ec6
branches:  trunk
changeset: 471137:2496bf186ec6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 19 20:27:44 2004 +0000

description:
Don't match "bin/libtool" and symlink into the buildlink directory if
libtool/buildlink3.mk is included by a package Makefile, as that symlink
overwrites the libtool wrapper script.  This fixes pkg/24851.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 5b30f17181d5 -r 2496bf186ec6 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Mar 19 18:36:46 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Fri Mar 19 20:27:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.125 2004/03/18 09:22:34 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.126 2004/03/19 20:27:44 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -590,7 +590,7 @@
        ${GREP} 'lib.*/lib[^/]*\.la$$'
 .  else
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=                                   \
-       ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
+       ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
 .  endif
 BUILDLINK_FILES_CMD.${_pkg_}?=                                         \
        ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |   \



Home | Main Index | Thread Index | Old Index