diff options
| author | jperkin <jperkin> | 2017-03-06 16:14:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-03-06 16:14:07 +0000 |
| commit | 2c7126e56fda2ab9d0d5f5996af882a6990e2ec8 (patch) | |
| tree | 043492c94801acdc8087a4520d513406a02d6708 /mk | |
| parent | f758a1bc1904ec2621e2a4efb7dc592df7c1772d (diff) | |
| download | pkgsrc-2c7126e56fda2ab9d0d5f5996af882a6990e2ec8.tar.gz | |
Update libtool packages to 2.4.6.
Changes since 2.4.2 are too numerous to mention, with over 4,700 lines
in the ChangeLog file. However, this release does at least fix a large
number of build failures on SmartOS, and doesn't appear to cause any
obvious regressions in bulk builds performed by Joerg and myself.
Some pkgsrc cleanups while here, including merging the MirBSD patches
correctly. It couldn't be made much clearer how to properly integrate
patches here to ensure they are not lost. Next time you might not be so
fortunate!
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/libtool-override.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk index 46bf4a484de..a2680ef9c9d 100644 --- a/mk/configure/libtool-override.mk +++ b/mk/configure/libtool-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: libtool-override.mk,v 1.12 2016/02/23 15:19:23 joerg Exp $ +# $NetBSD: libtool-override.mk,v 1.13 2017/03/06 16:14:08 jperkin Exp $ ###################################################################### ### {libtool,shlibtool,depcomp}-override (PRIVATE) @@ -18,7 +18,11 @@ OVERRIDE_DIRDEPTH.depcomp?= ${OVERRIDE_DIRDEPTH} _OVERRIDE_PATH.libtool= ${LIBTOOL} _OVERRIDE_PATH.shlibtool= ${SHLIBTOOL} +.if exists(${LOCALBASE}/share/libtool/config/depcomp) _OVERRIDE_PATH.depcomp= ${LOCALBASE}/share/libtool/config/depcomp +.else +_OVERRIDE_PATH.depcomp= ${LOCALBASE}/share/libtool/build-aux/depcomp +.endif .for _script_ in libtool shlibtool depcomp _SCRIPT.${_script_}-override= \ |