Wed Feb 19 15:21:35 2020 UTC ()
libevent: fix PR pkg/54983

Remove symlinks before faking .pc files.


(triaxx)
diff -r1.19 -r1.20 pkgsrc/devel/libevent/builtin.mk
cvs diff -r1.19 -r1.20 pkgsrc/devel/libevent/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/libevent/builtin.mk 2019/11/03 10:39:16 1.19
+++ pkgsrc/devel/libevent/builtin.mk 2020/02/19 15:21:34 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.19 2019/11/03 10:39:16 rillig Exp $ 1# $NetBSD: builtin.mk,v 1.20 2020/02/19 15:21:34 triaxx Exp $
2 2
3BUILTIN_PKG:= libevent 3BUILTIN_PKG:= libevent
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_LIBEVENT H_LIBEVENTCONFIG 5BUILTIN_FIND_HEADERS_VAR:= H_LIBEVENT H_LIBEVENTCONFIG
6BUILTIN_FIND_HEADERS.H_LIBEVENT= event.h 6BUILTIN_FIND_HEADERS.H_LIBEVENT= event.h
7BUILTIN_FIND_HEADERS.H_LIBEVENTCONFIG= event-config.h event2/event-config.h 7BUILTIN_FIND_HEADERS.H_LIBEVENTCONFIG= event-config.h event2/event-config.h
8 8
9.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
10 10
11### 11###
12### Determine if there is a built-in implementation of the package and 12### Determine if there is a built-in implementation of the package and
13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
14### 14###
@@ -143,55 +143,58 @@ do-configure-pre-hook: override-libevent @@ -143,55 +143,58 @@ do-configure-pre-hook: override-libevent
143 143
144BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 144BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
145LIBEVENT_PKGCFGF= libevent.pc 145LIBEVENT_PKGCFGF= libevent.pc
146LIBEVENT_OPENSSL_PKGCFGF= libevent_openssl.pc 146LIBEVENT_OPENSSL_PKGCFGF= libevent_openssl.pc
147LIBEVENT_PTHREADS_PKGCFGF= libevent_pthreads.pc 147LIBEVENT_PTHREADS_PKGCFGF= libevent_pthreads.pc
148 148
149override-libevent-pkgconfig: override-message-libevent-pkgconfig 149override-libevent-pkgconfig: override-message-libevent-pkgconfig
150override-message-libevent-pkgconfig: 150override-message-libevent-pkgconfig:
151 @${STEP_MSG} "Generating pkg-config files for builtin libevent package." 151 @${STEP_MSG} "Generating pkg-config files for builtin libevent package."
152 152
153override-libevent-pkgconfig: 153override-libevent-pkgconfig:
154 ${RUN} \ 154 ${RUN} \
155 ${MKDIR} ${BLKDIR_PKGCFG}; \ 155 ${MKDIR} ${BLKDIR_PKGCFG}; \
 156 ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; \
156 { \ 157 { \
157 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ 158 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \
158 ${ECHO} "exec_prefix=\$${prefix}"; \ 159 ${ECHO} "exec_prefix=\$${prefix}"; \
159 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 160 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
160 ${ECHO} "includedir=\$${prefix}/include"; \ 161 ${ECHO} "includedir=\$${prefix}/include"; \
161 ${ECHO} ""; \ 162 ${ECHO} ""; \
162 ${ECHO} "Name: libevent"; \ 163 ${ECHO} "Name: libevent"; \
163 ${ECHO} "Description: libevent is an asynchronous notification event loop library"; \ 164 ${ECHO} "Description: libevent is an asynchronous notification event loop library"; \
164 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \ 165 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \
165 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent"; \ 166 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent"; \
166 ${ECHO} "Cflags: -I\$${includedir}"; \ 167 ${ECHO} "Cflags: -I\$${includedir}"; \
167 } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; 168 } > ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF};
168 ${RUN} \ 169 ${RUN} \
 170 ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF}; \
169 { \ 171 { \
170 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ 172 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \
171 ${ECHO} "exec_prefix=\$${prefix}"; \ 173 ${ECHO} "exec_prefix=\$${prefix}"; \
172 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 174 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
173 ${ECHO} "includedir=\$${prefix}/include"; \ 175 ${ECHO} "includedir=\$${prefix}/include"; \
174 ${ECHO} ""; \ 176 ${ECHO} ""; \
175 ${ECHO} "Name: libevent_openssl"; \ 177 ${ECHO} "Name: libevent_openssl"; \
176 ${ECHO} "Description: libevent_openssl adds openssl-based TLS support to libevent"; \ 178 ${ECHO} "Description: libevent_openssl adds openssl-based TLS support to libevent"; \
177 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \ 179 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \
178 ${ECHO} "Requires: libevent"; \ 180 ${ECHO} "Requires: libevent"; \
179 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_openssl"; \ 181 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_openssl"; \
180 ${ECHO} "Cflags: -I\$${includedir}"; \ 182 ${ECHO} "Cflags: -I\$${includedir}"; \
181 } >> ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF}; 183 } > ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF};
182 ${RUN} \ 184 ${RUN} \
 185 ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF}; \
183 { \ 186 { \
184 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ 187 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \
185 ${ECHO} "exec_prefix=\$${prefix}"; \ 188 ${ECHO} "exec_prefix=\$${prefix}"; \
186 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 189 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
187 ${ECHO} "includedir=\$${prefix}/include"; \ 190 ${ECHO} "includedir=\$${prefix}/include"; \
188 ${ECHO} ""; \ 191 ${ECHO} ""; \
189 ${ECHO} "Name: libevent_pthreads"; \ 192 ${ECHO} "Name: libevent_pthreads"; \
190 ${ECHO} "Description: libevent_pthreads adds pthreads-based threading support to libevent"; \ 193 ${ECHO} "Description: libevent_pthreads adds pthreads-based threading support to libevent"; \
191 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \ 194 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \
192 ${ECHO} "Requires: libevent"; \ 195 ${ECHO} "Requires: libevent"; \
193 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_pthreads"; \ 196 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_pthreads"; \
194 ${ECHO} "Cflags: -I\$${includedir} -pthread"; \ 197 ${ECHO} "Cflags: -I\$${includedir} -pthread"; \
195 } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF}; 198 } > ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF};
196. endif 199. endif
197.endif 200.endif