diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-20 23:14:28 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-20 23:14:28 +0000 |
commit | 7f75b5acd6d04a5cbdc502db927d73be40731c01 (patch) | |
tree | 754c733526888ab4ddde9d9903b5f60b00f9ac04 /mk/bsd.buildlink.mk | |
parent | af84a04b849df802e68baf958154cad37100625f (diff) | |
download | pkgsrc-7f75b5acd6d04a5cbdc502db927d73be40731c01.tar.gz |
Filter out libtool archive files from being linked into ${BUILDLINK_DIR}
as they often add extra -L options to the compiler flags, which goes
against the buildlink.mk philosophy.
Diffstat (limited to 'mk/bsd.buildlink.mk')
-rw-r--r-- | mk/bsd.buildlink.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index bb1a33a8868..6080686bd3c 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.10 2001/06/19 04:19:50 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.11 2001/06/20 23:14:28 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -22,7 +22,9 @@ # BUILDLINK_PREFIX.<pkgname> installation prefix of the package # # BUILDLINK_FILES.<pkgname> files relative to ${BUILDLINK_PREFIX.<pkgname>} -# to be symlinked into ${BUILDLINK_DIR} +# to be symlinked into ${BUILDLINK_DIR}; +# libtool archive files are automatically +# filtered out and not linked # # BUILDLINK_TARGETS targets to be invoked during pre-configure; # the targets should be appended to this variable @@ -103,7 +105,9 @@ _BUILDLINK_USE: .USE if [ ! -f $${cookie} ]; then \ ${ECHO_MSG} "Linking ${.TARGET:S/-buildlink//} files into ${BUILDLINK_DIR}."; \ ${MKDIR} ${BUILDLINK_DIR}; \ - for file in ${BUILDLINK_FILES.${.TARGET:S/-buildlink//}:S/^/${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}\//g}; do \ + files="${BUILDLINK_FILES.${.TARGET:S/-buildlink//}:S/^/${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}\//g}"; \ + files="`${ECHO} $${files} | ${SED} -e 's|lib/[^[:blank:]]*.la||g'`"; \ + for file in $${files}; do \ rel_file=`${ECHO} $${file} | ${SED} -e "s|${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}/||"` ; \ if [ -z "${BUILDLINK_TRANSFORM.${.TARGET:S/-buildlink//}:Q}" ]; then \ dest=${BUILDLINK_DIR}/$${rel_file}; \ |