Mon Mar 11 18:06:05 2024 UTC (77d)
libuuid: Add /usr/include/uuid to the fake .pc.

Fixes software that only looks for <uuid.h>.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/devel/libuuid/builtin.mk

cvs diff -r1.13 -r1.14 pkgsrc/devel/libuuid/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/libuuid/builtin.mk 2024/01/13 20:07:32 1.13
+++ pkgsrc/devel/libuuid/builtin.mk 2024/03/11 18:06:05 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.13 2024/01/13 20:07:32 riastradh Exp $ 1# $NetBSD: builtin.mk,v 1.14 2024/03/11 18:06:05 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##
@@ -86,18 +86,18 @@ BUILDLINK_TRANSFORM+= rm:-luuid @@ -86,18 +86,18 @@ BUILDLINK_TRANSFORM+= rm:-luuid
86 86
87libuuid-fake-pc: 87libuuid-fake-pc:
88 ${RUN} \ 88 ${RUN} \
89 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ 89 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
90 src=${UUID_PC}; \ 90 src=${UUID_PC}; \
91 dst=${BUILDLINK_DIR}/lib/pkgconfig/uuid.pc; \ 91 dst=${BUILDLINK_DIR}/lib/pkgconfig/uuid.pc; \
92 if ${TEST} -f $${src}; then \ 92 if ${TEST} -f $${src}; then \
93 ${LN} -sf $${src} $${dst}; \ 93 ${LN} -sf $${src} $${dst}; \
94 else \ 94 else \
95 { ${ECHO} "Name: uuid"; \ 95 { ${ECHO} "Name: uuid"; \
96 ${ECHO} "Description: Universally unique id library"; \ 96 ${ECHO} "Description: Universally unique id library"; \
97 ${ECHO} "Version: ${BUILTIN_VERSION.libuuid}"; \ 97 ${ECHO} "Version: ${BUILTIN_VERSION.libuuid}"; \
98 ${ECHO} "Libs: -L/usr/lib -luuid ${LIBUUID_LDADD}"; \ 98 ${ECHO} "Libs: -L/usr/lib -luuid ${LIBUUID_LDADD}"; \
99 ${ECHO} "Cflags: -I/usr/include"; \ 99 ${ECHO} "Cflags: -I/usr/include -I/usr/include/uuid"; \
100 } >$${dst} ;\ 100 } >$${dst} ;\
101 fi 101 fi
102. endif 102. endif
103.endif # CHECK_BUILTIN.libuuid 103.endif # CHECK_BUILTIN.libuuid