Wed Feb 24 14:58:24 2016 UTC ()
libuuid on Darwin is in the main system library, so only perform the header
check for it to be deemed available.  Allows the builtin version to be used.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/devel/libuuid/builtin.mk
cvs diff -r1.7 -r1.8 pkgsrc/devel/libuuid/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/libuuid/builtin.mk 2014/09/19 12:50:43 1.7
+++ pkgsrc/devel/libuuid/builtin.mk 2016/02/24 14:58:24 1.8
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: builtin.mk,v 1.7 2014/09/19 12:50:43 jperkin Exp $ 1# $NetBSD: builtin.mk,v 1.8 2016/02/24 14:58:24 jperkin Exp $
2 2
3BUILTIN_PKG:= libuuid 3BUILTIN_PKG:= libuuid
4 4
5BUILTIN_FIND_FILES_VAR= UUID_PC 5BUILTIN_FIND_FILES_VAR= UUID_PC
6BUILTIN_FIND_FILES.UUID_PC= /usr/lib/pkgconfig/uuid.pc 6BUILTIN_FIND_FILES.UUID_PC= /usr/lib/pkgconfig/uuid.pc
7BUILTIN_FIND_HEADERS_VAR= H_UUID 7BUILTIN_FIND_HEADERS_VAR= H_UUID
8BUILTIN_FIND_HEADERS.H_UUID= uuid/uuid.h 8BUILTIN_FIND_HEADERS.H_UUID= uuid/uuid.h
9BUILTIN_FIND_GREP.H_UUID= uuid_generate 9BUILTIN_FIND_GREP.H_UUID= uuid_generate
10BUILTIN_FIND_LIBS:= uuid 10BUILTIN_FIND_LIBS:= uuid
11 11
12.include "../../mk/buildlink3/bsd.builtin.mk" 12.include "../../mk/buildlink3/bsd.builtin.mk"
13 13
14## 14##
15## Determine if there is a built-in implementation of the package and 15## Determine if there is a built-in implementation of the package and
16## set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 16## set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
17## 17##
18.if !defined(IS_BUILTIN.libuuid) 18.if !defined(IS_BUILTIN.libuuid)
19IS_BUILTIN.libuuid= no 19IS_BUILTIN.libuuid= no
20. if !empty(BUILTIN_LIB_FOUND.uuid:M[yY][eE][sS]) && \ 20. if (${OPSYS} == "Darwin" || !empty(BUILTIN_LIB_FOUND.uuid:M[yY][eE][sS])) \
21 empty(H_UUID:M__nonexistent__) 21 && empty(H_UUID:M__nonexistent__)
22IS_BUILTIN.libuuid= yes 22IS_BUILTIN.libuuid= yes
23. endif 23. endif
24.endif 24.endif
25MAKEVARS+= IS_BUILTIN.libuuid 25MAKEVARS+= IS_BUILTIN.libuuid
26 26
27### 27###
28### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 28### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
29### a package name to represent the built-in package. 29### a package name to represent the built-in package.
30### 30###
31.if !defined(BUILTIN_PKG.libuuid) && \ 31.if !defined(BUILTIN_PKG.libuuid) && \
32 !empty(IS_BUILTIN.libuuid:M[yY][eE][sS]) 32 !empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
33. if empty(UUID_PC:M__nonexistent__) 33. if empty(UUID_PC:M__nonexistent__)
34BUILTIN_PKG.libuuid!= ${SED} -n -e 's/Version: //p' ${UUID_PC} 34BUILTIN_PKG.libuuid!= ${SED} -n -e 's/Version: //p' ${UUID_PC}