diff options
| -rw-r--r-- | lang/clisp/Makefile | 5 | ||||
| -rw-r--r-- | mk/configure/libtool-override.mk | 38 |
2 files changed, 37 insertions, 6 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 98751acee72..cfd37f863b8 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2015/01/04 03:17:17 dholland Exp $ +# $NetBSD: Makefile,v 1.106 2016/02/23 15:19:23 joerg Exp $ # DISTNAME= clisp-2.49 @@ -20,6 +20,9 @@ BROKEN_ON_PLATFORM+= MirBSD-*-* MAKE_JOBS_SAFE= no +# Installs a copy of its own depcomp, avoid libtool dependency here. +OVERRIDE_DIRDEPTH.depcomp= 0 + GNU_CONFIGURE= yes CONFIGURE_DIRS= . USE_LIBTOOL= yes diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk index 259fdd8e30a..46bf4a484de 100644 --- a/mk/configure/libtool-override.mk +++ b/mk/configure/libtool-override.mk @@ -1,23 +1,26 @@ -# $NetBSD: libtool-override.mk,v 1.11 2015/05/04 19:23:19 joerg Exp $ +# $NetBSD: libtool-override.mk,v 1.12 2016/02/23 15:19:23 joerg Exp $ ###################################################################### -### {libtool,shlibtool}-override (PRIVATE) +### {libtool,shlibtool,depcomp}-override (PRIVATE) ###################################################################### -### {libtool,shlibtool}-override replace any existing libtool under +### {libtool,shlibtool,depcomp}-override replace any existing libtool under ### ${WRKSRC} with the version installed by pkgsrc. +### depcomp-override replaces the depcomp tool with the canonical version. ### -do-configure-post-hook: libtool-override +do-configure-post-hook: libtool-override depcomp-override .if defined(SHLIBTOOL_OVERRIDE) do-configure-post-hook: shlibtool-override .endif OVERRIDE_DIRDEPTH.libtool?= ${OVERRIDE_DIRDEPTH} OVERRIDE_DIRDEPTH.shlibtool?= ${OVERRIDE_DIRDEPTH} +OVERRIDE_DIRDEPTH.depcomp?= ${OVERRIDE_DIRDEPTH} _OVERRIDE_PATH.libtool= ${LIBTOOL} _OVERRIDE_PATH.shlibtool= ${SHLIBTOOL} +_OVERRIDE_PATH.depcomp= ${LOCALBASE}/share/libtool/config/depcomp -.for _script_ in libtool shlibtool +.for _script_ in libtool shlibtool depcomp _SCRIPT.${_script_}-override= \ ${RM} -f $$file; \ ${ECHO} "\#!"${TOOLS_SH:Q} > $$file; \ @@ -74,3 +77,28 @@ shlibtool-override: depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \ done .endif + +.PHONY: depcomp-override +depcomp-override: + @${STEP_MSG} "Modifying libtool scripts to use pkgsrc depcomp" +.if !empty(DEPCOMP_OVERRIDE:U) + ${RUN} \ + cd ${WRKSRC}; \ + set -- dummy ${DEPCOMP_OVERRIDE}; shift; \ + while [ $$# -gt 0 ]; do \ + file="$$1"; shift; \ + [ -f "$$file" ] || [ -h "$$file" ] || continue; \ + ${_SCRIPT.${.TARGET}}; \ + done +.else + ${RUN} \ + cd ${WRKSRC}; \ + depth=0; pattern=depcomp; \ + while [ $$depth -le ${OVERRIDE_DIRDEPTH.depcomp} ]; do \ + for file in $$pattern; do \ + [ -f "$$file" ] || [ -h "$$file" ] || continue; \ + ${_SCRIPT.${.TARGET}}; \ + done; \ + depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \ + done +.endif |