diff options
| author | jlam <jlam@pkgsrc.org> | 2002-03-20 14:11:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-03-20 14:11:54 +0000 |
| commit | db33d0c79d5cc831ae0e3966fabe070733596fd6 (patch) | |
| tree | 7f1ba32b5bcc1ed71da15015d6fcf5406ba0454b /mk | |
| parent | a7bcc8844b54a6923fe5567c1b9da58b210d47f5 (diff) | |
| download | pkgsrc-db33d0c79d5cc831ae0e3966fabe070733596fd6.tar.gz | |
Disable the code added in the previous commit. It seems to be causing
problems linking against libintl in the base system (pkg/15964).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.buildlink.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index 59e28863183..ac77fe8c837 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.58 2002/03/18 17:45:34 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.59 2002/03/20 14:11:54 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -141,6 +141,8 @@ MAKE_ENV+= BUILDLINK_LDFLAGS="${_BUILDLINK_LDFLAGS}" ECHO_BUILDLINK_MSG?= ${ECHO_MSG} "=>" +.if defined(_BUILDLINK_LIBTOOL_ARCHIVES) && \ + (${_BUILDLINK_LIBTOOL_ARCHIVES} == "YES") # _LIBTOOL_ARCHIVE_TRANSFORM creates $${dest} from $${file}, where # $${file} is a libtool archive (*.la). It allows libtool to properly # interact with buildlink at link time by linking against the libraries @@ -156,6 +158,9 @@ _LIBTOOL_ARCHIVE_TRANSFORM_SED+= ${_BUILDLINK_CONFIG_WRAPPER_SED} _LIBTOOL_ARCHIVE_TRANSFORM= \ ${SED} ${_LIBTOOL_ARCHIVE_TRANSFORM_SED} $${file} > $${dest} +.else +_LIBTOOL_ARCHIVE_TRANSFORM= ${TRUE} +.endif _BUILDLINK_USE: .USE ${_PKG_SILENT}${_PKG_DEBUG} \ |