fonts/font-util: New pkgconfig.mk for cross-compilation assistance.
Fixes cross-build of modular-xorg-fonts.
This commit is contained in:
parent
2849574cc7
commit
aa2710e90a
10 changed files with 53 additions and 18 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.11 2023/02/27 20:21:12 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-adobe-100dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-adobe-100dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-adobe-100dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.11 2023/02/28 06:49:14 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-adobe-75dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-adobe-75dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-adobe-75dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.11 2023/02/28 06:50:02 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-adobe-utopia-100dpi-1.0.5
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-adobe-utopia-100dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-adobe-utopia-100dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.11 2023/02/28 06:52:32 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-adobe-utopia-75dpi-1.0.5
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-adobe-utopia-75dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-adobe-utopia-75dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.10 2023/02/28 06:55:37 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-bh-100dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-bh-100dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bh-100dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.10 2023/02/28 06:56:37 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-bh-75dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -19,6 +19,6 @@ INSTALLATION_DIRS= share/doc/font-bh-75dpi
|
|||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bh-75dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2023/02/28 06:57:45 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2023/06/27 10:43:33 riastradh Exp $
|
||||
|
||||
DISTNAME= font-bh-lucidatypewriter-100dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -14,6 +14,6 @@ USE_TOOLS+= pkg-config bdftopcf ucs2any gzip
|
|||
|
||||
FONTS_DIRS.x11= share/fonts/X11/100dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2023/02/28 06:58:47 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2023/06/27 10:43:34 riastradh Exp $
|
||||
|
||||
DISTNAME= font-bh-lucidatypewriter-75dpi-1.0.4
|
||||
CATEGORIES= fonts
|
||||
|
@ -14,6 +14,6 @@ USE_TOOLS+= pkg-config bdftopcf ucs2any gzip
|
|||
|
||||
FONTS_DIRS.x11= share/fonts/X11/75dpi
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2023/02/28 07:13:41 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2023/06/27 10:43:34 riastradh Exp $
|
||||
|
||||
DISTNAME= font-misc-misc-1.1.3
|
||||
CATEGORIES= fonts
|
||||
|
@ -14,6 +14,6 @@ USE_TOOLS+= gmake pkg-config bdftopcf ucs2any gzip
|
|||
|
||||
FONTS_DIRS.x11= share/fonts/X11/misc
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
||||
.include "../../fonts/font-util/pkgconfig.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
35
fonts/font-util/pkgconfig.mk
Normal file
35
fonts/font-util/pkgconfig.mk
Normal file
|
@ -0,0 +1,35 @@
|
|||
# $NetBSD: pkgconfig.mk,v 1.1 2023/06/27 10:43:34 riastradh Exp $
|
||||
|
||||
# Fragment to be included by packages that use font-util and detect its
|
||||
# parameters with pkg-config, so that they get the right paths in
|
||||
# cross-builds.
|
||||
#
|
||||
# used-by fonts/font-adobe-100dpi/Makefile
|
||||
# used-by fonts/font-adobe-75dpi/Makefile
|
||||
# used-by fonts/font-adobe-utopia-100dpi/Makefile
|
||||
# used-by fonts/font-adobe-utopia-75dpi/Makefile
|
||||
# used-by fonts/font-bh-100dpi/Makefile
|
||||
# used-by fonts/font-bh-75dpi/Makefile
|
||||
# used-by fonts/font-bh-lucidatypewriter-100dpi/Makefile
|
||||
# used-by fonts/font-bh-lucidatypewriter-75dpi/Makefile
|
||||
# used-by fonts/font-misc-misc/Makefile
|
||||
|
||||
USE_TOOLS+= pkg-config
|
||||
|
||||
.include "../../mk/bsd.fast.prefs.mk"
|
||||
|
||||
.if ${USE_CROSS_COMPILE:tl} == "yes"
|
||||
# Set PKG_CONFIG_SYSROOT_DIR so that configure can find MAPFILES_PATH
|
||||
# from `pkg-config --variable=mapdir fontutil' and read files under it
|
||||
# at build-time. There is no way to set it explicitly -- it is only
|
||||
# discovered through pkg-config.
|
||||
CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR=${_CROSS_DESTDIR:Q}
|
||||
|
||||
# Set FONTROOTDIR explicitly to override the default of `pkg-config
|
||||
# --variable=fontrootdir fontutil' which, with PKG_CONFIG_SYSROOT_DIR
|
||||
# set, includes the cross-destdir, which is wrong, because the build
|
||||
# treats this as relative to the destdir.
|
||||
CONFIGURE_ARGS+= --with-fontrootdir=${LOCALBASE:Q}/share/fonts/X11
|
||||
.endif
|
||||
|
||||
.include "../../fonts/font-util/buildlink3.mk"
|
Loading…
Reference in a new issue