Page MenuHomeFreeBSD
Files F110625488

D35494.diff
No OneTemporary
Actions

D35494.diff
View Options

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1050,7 +1050,8 @@
MINIMAL_PKG_VERSION= 1.17.2
_PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
- ${STAGEDIR}${PREFIX} ${WRKDIR}/pkg ${BINARY_LINKDIR}
+ ${STAGEDIR}${PREFIX} ${WRKDIR}/pkg ${BINARY_LINKDIR} \
+ ${PKGCONFIG_LINKDIR}
# Ensure .CURDIR contains an absolute path without a trailing slash. Failed
# builds can occur when PORTSDIR is a symbolic link, or with something like
@@ -1681,6 +1682,13 @@
CONFIGURE_ENV+= PATH=${PATH}
. endif
+PKGCONFIG_LINKDIR= ${WRKDIR}/.pkgconfig
+PKGCONFIG_BASEDIR= /usr/libdata/pkgconfig
+. if !${MAKE_ENV:MPKG_CONFIG_LIBDIR=*} && !${CONFIGURE_ENV:MPKG_CONFIG_LIBDIR=*}
+MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR}
+CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKGCONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig:${PKGCONFIG_BASEDIR}
+. endif
+
. if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
. if defined(WRKSRC)
DEV_WARNING+= "You are using USE_GITHUB and WRKSRC is set which is wrong. Set GH_PROJECT correctly or set WRKSRC_SUBDIR and remove WRKSRC entirely."
@@ -5147,6 +5155,20 @@
. endif
. endif
+. if !empty(PKGCONFIG_BASE)
+. if !target(create-base-pkgconfig)
+create-base-pkgconfig: ${PKGCONFIG_LINKDIR}
+. for pcfile in ${PKGCONFIG_BASE:S/$/.pc/}
+ @if `test -f ${PKGCONFIG_BASEDIR}/${pcfile}`; then \
+ ${RLN} ${PKGCONFIG_BASEDIR}/${pcfile} ${PKGCONFIG_LINKDIR}/${pcfile}; \
+ else \
+ ${ECHO_MSG} "===> Missing \"${pcfile}\" to create a link at \"${PKGCONFIG_LINKDIR}/${pcfile}\" "; \
+ ${FALSE}; \
+ fi
+. endfor
+. endif
+. endif
+
. if !empty(BINARY_WRAPPERS)
. if !target(create-binary-wrappers)
create-binary-wrappers: ${BINARY_LINKDIR}
@@ -5256,7 +5278,7 @@
${_OPTIONS_patch} ${_USES_patch}
_CONFIGURE_DEP= patch
_CONFIGURE_SEQ= 150:build-depends 151:lib-depends 160:create-binary-alias \
- 161:create-binary-wrappers \
+ 161:create-binary-wrappers 170:create-base-pkgconfig \
200:configure-message 210:apply-slist \
300:pre-configure 450:pre-configure-script \
490:run-autotools-fixup 500:do-configure 700:post-configure \

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 2:19 AM (3 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16764583
Default Alt Text
D35494.diff (2 KB)

Event Timeline