diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-07-19 14:35:37 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-07-19 14:35:37 +0000 |
| commit | b3f78c20fa647fbe1e7ef702ad5bbbe4d7e44627 (patch) | |
| tree | 4f378b534c1b499d9197c3f9b6a4295e098a8e33 /devel/editline | |
| parent | bdd4aa8a462e03c3c688bcaa96bbf96cc5b322e0 (diff) | |
| download | pkgsrc-b3f78c20fa647fbe1e7ef702ad5bbbe4d7e44627.tar.gz | |
Fix builtin detection conditionals.
* Correct detection of following cases.
non-editline/readline, editline/non-readline, and editline/readline.
* If builtin editline has header files in include/editline, create
include/readline/* symlinks.
* Fix PR pkg/48062 with above fixes. Confirmed on Ubuntu Linux/amd64 13.04.
Diffstat (limited to 'devel/editline')
| -rw-r--r-- | devel/editline/builtin.mk | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/devel/editline/builtin.mk b/devel/editline/builtin.mk index 14144e01059..2bfd9783475 100644 --- a/devel/editline/builtin.mk +++ b/devel/editline/builtin.mk @@ -1,10 +1,11 @@ -# $NetBSD: builtin.mk,v 1.1 2013/07/15 01:42:47 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2013/07/19 14:35:37 ryoon Exp $ BUILTIN_PKG:= editline BUILTIN_FIND_LIBS:= edit BUILTIN_FIND_FILES_VAR:= H_EDITLINE -BUILTIN_FIND_FILES.H_EDITLINE= /usr/include/readline/readline.h +BUILTIN_FIND_FILES.H_EDITLINE= /usr/include/editline/readline.h \ + /usr/include/readline/readline.h .include "../../mk/buildlink3/bsd.builtin.mk" @@ -45,8 +46,41 @@ USE_BUILTIN.editline= yes . endif MAKEVARS+= USE_BUILTIN.readline +.if !empty(H_EDITLINE:M/usr/include/editline/readline.h) +BUILDLINK_TARGETS+= buildlink-readline-readline-h +BUILDLINK_TARGETS+= buildlink-readline-history-h +.endif + BUILDLINK_TRANSFORM+= l:history:edit:${BUILTIN_LIBNAME.termcap} BUILDLINK_TRANSFORM+= l:readline:edit:${BUILTIN_LIBNAME.termcap} .endif +. if !target(buildlink-readline-readline-h) +.PHONY: buildlink-readline-readline-h +buildlink-readline-readline-h: + ${RUN} \ + src=${H_EDITLINE:Q}; \ + dest=${BUILDLINK_DIR}"/include/readline/readline.h"; \ + if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ + fname=`${BASENAME} $$src`; \ + ${ECHO_BUILDLINK_MSG} "Linking $$fname -> readline.h."; \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -s "$$src" "$$dest"; \ + fi +. endif + +. if !target(buildlink-readline-history-h) +.PHONY: buildlink-readline-history-h +buildlink-readline-history-h: + ${RUN} \ + src=${H_EDITLINE:Q}; \ + dest=${BUILDLINK_DIR}"/include/readline/history.h"; \ + if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ + fname=`${BASENAME} $$src`; \ + ${ECHO_BUILDLINK_MSG} "Linking $$fname -> history.h."; \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -s "$$src" "$$dest"; \ + fi +. endif + .endif # CHECK_BUILTIN.readline |