diff options
| author | ryoon <ryoon> | 2013-07-19 14:35:37 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-07-19 14:35:37 +0000 |
| commit | a34abb867b01e1d7f72efb3c82d4bde6f5825043 (patch) | |
| tree | 4f378b534c1b499d9197c3f9b6a4295e098a8e33 /mk | |
| parent | 790fc95f15ef485deb36f796f17a055c49973787 (diff) | |
| download | pkgsrc-a34abb867b01e1d7f72efb3c82d4bde6f5825043.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 'mk')
| -rw-r--r-- | mk/readline.buildlink3.mk | 10 | ||||
| -rw-r--r-- | mk/readline.builtin.mk | 28 |
2 files changed, 21 insertions, 17 deletions
diff --git a/mk/readline.buildlink3.mk b/mk/readline.buildlink3.mk index a687f80c2bc..9d794ef1c13 100644 --- a/mk/readline.buildlink3.mk +++ b/mk/readline.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: readline.buildlink3.mk,v 1.2 2013/07/18 14:59:04 ryoon Exp $ +# $NetBSD: readline.buildlink3.mk,v 1.3 2013/07/19 14:35:37 ryoon Exp $ # # This Makefile fragment is meant to be included by packages that require # any readline implementation instead of one particular one. The available @@ -43,10 +43,12 @@ CHECK_BUILTIN.editlinereadline:= no # .if defined(IS_BUILTIN.editline) && \ !empty(IS_BUILTIN.editline:M[Yy][Ee][Ss]) -READLINE_DEFAULT= editline -.else if defined(IS_BUILTIN.readline) && \ +READLINE_DEFAULT?= editline +.elif defined(IS_BUILTIN.readline) && \ !empty(IS_BUILTIN.readline:M[Yy][Ee][Ss]) -READLINE_DEFAULT= readline +READLINE_DEFAULT?= readline +.else +READLINE_DEFAULT?= editline .endif diff --git a/mk/readline.builtin.mk b/mk/readline.builtin.mk index 226eb80e70f..9f43e5cfe02 100644 --- a/mk/readline.builtin.mk +++ b/mk/readline.builtin.mk @@ -1,31 +1,33 @@ -# $NetBSD: readline.builtin.mk,v 1.2 2013/07/18 14:59:04 ryoon Exp $ +# $NetBSD: readline.builtin.mk,v 1.3 2013/07/19 14:35:37 ryoon Exp $ # BUILTIN_PKG:= editlinereadline BUILTIN_FIND_LIBS:= edit readline history -BUILTIN_FIND_FILES_VAR:= H_READLINE _BLTN_H_READLINE +BUILTIN_FIND_FILES_VAR:= H_EDITLINE H_READLINE BUILTIN_FIND_FILES.H_READLINE= /usr/include/readline/readline.h \ /usr/include/readline.h -BUILTIN_FIND_FILES._BLTN_H_READLINE= \ - /usr/include/readline/readline.h \ - /usr/include/readline.h +BUILTIN_FIND_FILES.H_EDITLINE= /usr/include/editline/readline.h \ + /usr/include/readline/readline.h +BUILTIN_FIND_GREP.H_EDITLINE= NetBSD BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR .include "../../mk/buildlink3/bsd.builtin.mk" .if !defined(IS_BUILTIN.editlinereadline) IS_BUILTIN.editlinereadline= no -. if empty(H_READLINE:M__nonexistent__) && \ - empty(H_READLINE:M${LOCALBASE}/*) && \ - !empty(BUILTIN_LIB_FOUND.readline:M[yY][eE][sS]) -IS_BUILTIN.readline= yes -IS_BUILTIN.editlinereadline= yes -. else if empty(_BLTN_H_READLINE:M__nonexistent__) && \ - !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \ - !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +. if empty(H_EDITLINE:M__nonexistent__) && \ + !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) IS_BUILTIN.editline= yes IS_BUILTIN.editlinereadline= yes +. elif empty(H_READLINE:M__nonexistent__) && \ + !empty(BUILTIN_LIB_FOUND.readline:M[yY][eE][sS]) +IS_BUILTIN.readline= yes +IS_BUILTIN.editlinereadline= yes +. else +IS_BUILTIN.editline= no +IS_BUILTIN.readline= no +IS_BUILTIN.editlinereadline= no . endif .endif |