Wed Mar 18 19:17:39 2015 UTC ()
I've we detected an Mac OS X SDK location use it as the prefix of the
builtin "editline" package.

This fixes the build of the "mysql56-client" package (and possibly others)
under Mac OS X Yosemite with a clean install of Xcode (in particular
with no files in "/Developer").


(tron)
diff -r1.6 -r1.7 pkgsrc/devel/editline/builtin.mk
cvs diff -r1.6 -r1.7 pkgsrc/devel/editline/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/editline/builtin.mk 2014/06/09 00:26:19 1.6
+++ pkgsrc/devel/editline/builtin.mk 2015/03/18 19:17:39 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.6 2014/06/09 00:26:19 obache Exp $ 1# $NetBSD: builtin.mk,v 1.7 2015/03/18 19:17:39 tron Exp $
2 2
3BUILTIN_PKG:= editline 3BUILTIN_PKG:= editline
4 4
5BUILTIN_FIND_LIBS:= edit 5BUILTIN_FIND_LIBS:= edit
6BUILTIN_FIND_HEADERS_VAR:= H_EDITLINE 6BUILTIN_FIND_HEADERS_VAR:= H_EDITLINE
7BUILTIN_FIND_HEADERS.H_EDITLINE=editline/readline.h \ 7BUILTIN_FIND_HEADERS.H_EDITLINE=editline/readline.h \
8 readline/readline.h 8 readline/readline.h
9 9
10.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
@@ -38,26 +38,29 @@ USE_BUILTIN.editline= yes @@ -38,26 +38,29 @@ USE_BUILTIN.editline= yes
38MAKEVARS+= USE_BUILTIN.editline 38MAKEVARS+= USE_BUILTIN.editline
39. endif 39. endif
40.endif 40.endif
41 41
42CHECK_BUILTIN.editline?= no 42CHECK_BUILTIN.editline?= no
43.if !empty(CHECK_BUILTIN.editline:M[nN][oO]) 43.if !empty(CHECK_BUILTIN.editline:M[nN][oO])
44 44
45. if !empty(_PKG_USE_READLINE:U:M[yY][eE][sS]) 45. if !empty(_PKG_USE_READLINE:U:M[yY][eE][sS])
46BUILDLINK_TRANSFORM+= l:history:edit:${BUILTIN_LIBNAME.termcap} 46BUILDLINK_TRANSFORM+= l:history:edit:${BUILTIN_LIBNAME.termcap}
47BUILDLINK_TRANSFORM+= l:readline:edit:${BUILTIN_LIBNAME.termcap} 47BUILDLINK_TRANSFORM+= l:readline:edit:${BUILTIN_LIBNAME.termcap}
48. endif 48. endif
49 49
50. if !empty(USE_BUILTIN.editline:M[yY][eE][sS]) 50. if !empty(USE_BUILTIN.editline:M[yY][eE][sS])
 51. if defined(OSX_SDK_PATH) && exists(${OSX_SDK_PATH}/usr/include/readline)
 52BUILDLINK_PREFIX.editline= ${OSX_SDK_PATH}/usr
 53. endif
51. if !empty(H_EDITLINE:M*/editline/readline.h) 54. if !empty(H_EDITLINE:M*/editline/readline.h)
52BUILDLINK_TARGETS+= buildlink-readline-readline-h 55BUILDLINK_TARGETS+= buildlink-readline-readline-h
53BUILDLINK_TARGETS+= buildlink-readline-history-h 56BUILDLINK_TARGETS+= buildlink-readline-history-h
54. endif 57. endif
55 58
56. if !target(buildlink-readline-readline-h) 59. if !target(buildlink-readline-readline-h)
57.PHONY: buildlink-readline-readline-h 60.PHONY: buildlink-readline-readline-h
58buildlink-readline-readline-h: 61buildlink-readline-readline-h:
59 ${RUN} \ 62 ${RUN} \
60 src=${H_EDITLINE:Q}; \ 63 src=${H_EDITLINE:Q}; \
61 dest=${BUILDLINK_DIR}"/include/readline/readline.h"; \ 64 dest=${BUILDLINK_DIR}"/include/readline/readline.h"; \
62 if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ 65 if ${TEST} ! -f "$$dest" -a -f "$$src"; then \
63 fname=`${BASENAME} $$src`; \ 66 fname=`${BASENAME} $$src`; \