CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Taylor R Campbell" <riastradh%netbsd.org@localhost>
Date: Sat, 25 Jan 2025 10:15:24 +0000

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 25 10:15:24 UTC 2025

Modified Files:
        pkgsrc/devel/at-spi2-core: Makefile
        pkgsrc/devel/meson: build.mk
        pkgsrc/devel/pango: Makefile
        pkgsrc/devel/wayland-protocols: Makefile
        pkgsrc/graphics/gdk-pixbuf2: Makefile
        pkgsrc/x11/gtk3: Makefile

Log Message:
devel/meson/build.mk: Change MESON_CROSS_BINARIES -> MESON_BINARIES.

Use this with native builds too, via --native-file, if enabled.  No
change to builds that don't opt into using MESON_BINARIES.

Usage:

MESON_BINARIES+=        foo bar
MESON_BINARY.foo=       ${TOOLBASE}/libexec/foo
MESON_BINARY_KEY.bar=   ${PREFIX}/bin/bar
MESON_BINARY.bar=       ${TOOLBASE}/bin/bar

Assuming PREFIX=/usr/pkg and TOOLBASE=/home/dev/pkg, this will build
with the following [binaries] section in the meson --native-file or
--cross-file:

[binaries]
foo = '/home/dev/pkg/libexec/foo'
/usr/pkg/bin/bar = '/home/dev/pkg/libexec/bar'


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/meson/build.mk
cvs rdiff -u -r1.269 -r1.270 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/wayland-protocols/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.210 -r1.211 pkgsrc/x11/gtk3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/at-spi2-core/Makefile
diff -u pkgsrc/devel/at-spi2-core/Makefile:1.55 pkgsrc/devel/at-spi2-core/Makefile:1.56
--- pkgsrc/devel/at-spi2-core/Makefile:1.55     Sun Jan 12 19:23:00 2025
+++ pkgsrc/devel/at-spi2-core/Makefile  Sat Jan 25 10:15:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2025/01/12 19:23:00 riastradh Exp $
+# $NetBSD: Makefile,v 1.56 2025/01/25 10:15:23 riastradh Exp $
 
 DISTNAME=      at-spi2-core-2.54.0
 PKGREVISION=   4
@@ -33,10 +33,10 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autost
 .include "../../mk/bsd.prefs.mk"
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
-MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
-MESON_CROSS_BINARY.glib-genmarshal=    ${TOOLBASE}/bin/glib-genmarshal
-MESON_CROSS_BINARY.glib-mkenums=       ${TOOLBASE}/bin/glib-mkenums
+TOOL_DEPENDS+=                 glib2-tools>=0:../../devel/glib2-tools
+MESON_BINARIES+=               glib-genmarshal glib-mkenums
+MESON_BINARY.glib-genmarshal=  ${TOOLBASE}/bin/glib-genmarshal
+MESON_BINARY.glib-mkenums=     ${TOOLBASE}/bin/glib-mkenums
 .endif
 
 PYTHON_FOR_BUILD_ONLY= tool

Index: pkgsrc/devel/meson/build.mk
diff -u pkgsrc/devel/meson/build.mk:1.30 pkgsrc/devel/meson/build.mk:1.31
--- pkgsrc/devel/meson/build.mk:1.30    Sat Jan 25 09:49:47 2025
+++ pkgsrc/devel/meson/build.mk Sat Jan 25 10:15:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.30 2025/01/25 09:49:47 riastradh Exp $
+# $NetBSD: build.mk,v 1.31 2025/01/25 10:15:23 riastradh Exp $
 
 MESON_REQD?=   0
 .for version in ${MESON_REQD}
@@ -27,7 +27,25 @@ MAKE_ENV+=   CMAKE=${TOOLS_PATH.false}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
+.if ${USE_CROSS_COMPILE:tl} == no
+
+MESON_NATIVE_FILE=     ${WRKDIR}/.meson_native
+MESON_NATIVE_ARGS+=    --native-file ${MESON_NATIVE_FILE:Q}
+meson-configure: ${MESON_NATIVE_FILE}
+${MESON_NATIVE_FILE}:
+       @${STEP_MSG} Creating meson native file
+       ${RUN}${RM} -f ${.TARGET}.tmp
+       ${RUN}${ECHO} '[binaries]' >>${.TARGET}.tmp
+.  for _v_ in ${MESON_BINARIES}
+.    if !defined(MESON_BINARY.${_v_})
+.      error MESON_BINARIES lists ${_v_} but MESON_BINARY.${_v_} is undefined
+.    endif
+       ${RUN}${ECHO} ${MESON_BINARY_KEY.${_v_}:U${_v_}} = \'${MESON_BINARY.${_v_}:Q}\' \
+               >>${.TARGET}.tmp
+.  endfor
+       ${RUN}${MV} -f ${.TARGET}.tmp ${.TARGET}
+
+.else
 
 MESON_CPU_FAMILY.amd64=                x86_64
 MESON_CPU_FAMILY.arm26?=       arm
@@ -87,9 +105,11 @@ MESON_CROSS_VARS+=  sys_root
 MESON_CROSS.sys_root=  '${_CROSS_DESTDIR}'
 
 MESON_CROSS_FILE=      ${WRKDIR}/.meson_cross
+MESON_CROSS_ARGS+=     --cross-file ${MESON_CROSS_FILE:Q}
 meson-configure: ${MESON_CROSS_FILE}
 ${MESON_CROSS_FILE}:
        @${STEP_MSG} Creating meson cross file
+       ${RUN}${RM} -f ${.TARGET}.tmp
        ${RUN}${ECHO} '[properties]' >${.TARGET}.tmp
 .  for _v_ in ${MESON_CROSS_VARS}
 .    if defined(MESON_CROSS.${_v_})
@@ -114,15 +134,14 @@ ${MESON_CROSS_FILE}:
        ${RUN}${ECHO} "cpu = '${MESON_CPU}'" >>${.TARGET}.tmp
        ${RUN}${ECHO} "endian = '${MESON_CPU_ENDIAN}'" >>${.TARGET}.tmp
        ${RUN}${ECHO} '[binaries]' >>${.TARGET}.tmp
-.  for _v_ in ${MESON_CROSS_BINARIES}
-.    if !defined(MESON_CROSS_BINARY.${_v_})
-.      error MESON_CROSS_BINARIES lists ${_v_} but MESON_CROSS_BINARY.${_v_} is undefined
+.  for _v_ in ${MESON_BINARIES}
+.    if !defined(MESON_BINARY.${_v_})
+.      error MESON_BINARIES lists ${_v_} but MESON_BINARY.${_v_} is undefined
 .    endif
-       ${RUN}${ECHO} ${MESON_CROSS_BINARY_KEY.${_v_}:U${_v_}} = \'${MESON_CROSS_BINARY.${_v_}:Q}\' \
+       ${RUN}${ECHO} ${MESON_BINARY_KEY.${_v_}:U${_v_}} = \'${MESON_BINARY.${_v_}:Q}\' \
                >>${.TARGET}.tmp
 .  endfor
        ${RUN}${MV} -f ${.TARGET}.tmp ${.TARGET}
-MESON_CROSS_ARGS+=     --cross-file ${MESON_CROSS_FILE:Q}
 
 .endif                         # ${USE_CROSS_COMPILE:U:tl} == yes
 
@@ -139,7 +158,7 @@ meson-configure:
                --mandir ${PKGMANDIR} \
                --sysconfdir ${PKG_SYSCONFDIR} \
                --wrap-mode=nodownload \
-               ${MESON_CROSS_ARGS} \
+               ${MESON_CROSS_ARGS} ${MESON_NATIVE_ARGS} \
                --buildtype=plain ${MESON_ARGS} . output
 .endfor
 
@@ -186,12 +205,12 @@ _PKG_VARS.meson+= TEST_DIRS TEST_ENV
 _PKG_VARS.meson+=      INSTALL_DIRS INSTALL_ENV
 _PKG_VARS.meson+=      LLVM_CONFIG_PATH
 _PKG_VARS.meson+=      USE_CMAKE MESON_ARGS
+_PKG_VARS.meson+=      MESON_BINARIES
+_PKG_VARS.meson+=      MESON_BINARY.*
+_PKG_VARS.meson+=      MESON_BINARY_KEY.*
 _PKG_VARS.meson+=      MESON_CROSS_ARCH_VARS
 _PKG_VARS.meson+=      MESON_CROSS_OPSYS_VARS
 _PKG_VARS.meson+=      MESON_CROSS_VARS MESON_CROSS.*
-_PKG_VARS.meson+=      MESON_CROSS_BINARIES
-_PKG_VARS.meson+=      MESON_CROSS_BINARY.*
-_PKG_VARS.meson+=      MESON_CROSS_BINARY_KEY.*
 _USER_VARS.meson=      MAKE_JOBS PKG_SYSCONFDIR
 _USE_VARS.meson=       TOOLS_PATH.false WRKDIR WRKSRC PREFIX PKGMANDIR
 _USE_VARS.meson+=      MACHINE_ARCH
@@ -253,6 +272,8 @@ _IGN_VARS.meson+=   MESON_CPU_FAMILY.power
 _IGN_VARS.meson+=      MESON_CPU_FAMILY.sh3eb
 _IGN_VARS.meson+=      MESON_CPU_FAMILY.sh3el
 _IGN_VARS.meson+=      MESON_CROSS.sys_root
+_IGN_VARS.meson+=      MESON_NATIVE_ARGS
+_IGN_VARS.meson+=      MESON_NATIVE_FILE
 _IGN_VARS.meson+=      MESON_CROSS_ARGS
 _IGN_VARS.meson+=      MESON_CROSS_FILE
 _LISTED_VARS.meson=    *_ARGS *_DEPENDS

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.269 pkgsrc/devel/pango/Makefile:1.270
--- pkgsrc/devel/pango/Makefile:1.269   Sat Jan 11 18:10:53 2025
+++ pkgsrc/devel/pango/Makefile Sat Jan 25 10:15:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.269 2025/01/11 18:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.270 2025/01/25 10:15:23 riastradh Exp $
 
 DISTNAME=      pango-1.56.0
 CATEGORIES=    devel fonts
@@ -27,10 +27,10 @@ MESON_ARGS+=                -Dcairo=enabled
 MESON_ARGS+=           -Dfontconfig=enabled
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
-MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
-MESON_CROSS_BINARY.glib-genmarshal+=   ${TOOLBASE:Q}/bin/glib-genmarshal
-MESON_CROSS_BINARY.glib-mkenums+=      ${TOOLBASE:Q}/bin/glib-mkenums
+TOOL_DEPENDS+=                 glib2-tools>=0:../../devel/glib2-tools
+MESON_BINARIES+=               glib-genmarshal glib-mkenums
+MESON_BINARY.glib-genmarshal=  ${TOOLBASE}/bin/glib-genmarshal
+MESON_BINARY.glib-mkenums=     ${TOOLBASE}/bin/glib-mkenums
 .endif
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/pango.pc

Index: pkgsrc/devel/wayland-protocols/Makefile
diff -u pkgsrc/devel/wayland-protocols/Makefile:1.16 pkgsrc/devel/wayland-protocols/Makefile:1.17
--- pkgsrc/devel/wayland-protocols/Makefile:1.16        Sat Jan 25 09:49:57 2025
+++ pkgsrc/devel/wayland-protocols/Makefile     Sat Jan 25 10:15:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2025/01/25 09:49:57 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2025/01/25 10:15:23 riastradh Exp $
 
 DISTNAME=      wayland-protocols-1.39
 CATEGORIES=    devel
@@ -26,9 +26,9 @@ PKGCONFIG_OVERRIDE+=  wayland-protocols.p
 # up a meson cross binary with the whole PREFIX-qualified original
 # pathname.
 TOOL_DEPENDS+=                         wayland>=0:../../wayland
-MESON_CROSS_BINARIES+=                 wayland_scanner
-MESON_CROSS_BINARY_KEY.wayland_scanner=        ${PREFIX}/bin/wayland-scanner
-MESON_CROSS_BINARY.wayland_scanner=    ${TOOLBASE}/bin/wayland-scanner
+MESON_BINARIES+=                       wayland_scanner
+MESON_BINARY_KEY.wayland_scanner=      ${PREFIX}/bin/wayland-scanner
+MESON_BINARY.wayland_scanner=          ${TOOLBASE}/bin/wayland-scanner
 .endif
 
 .include "../../devel/meson/build.mk"

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.65 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.66
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.65   Thu Jun 27 15:19:59 2024
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile        Sat Jan 25 10:15:24 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2024/06/27 15:19:59 adam Exp $
+# $NetBSD: Makefile,v 1.66 2025/01/25 10:15:24 riastradh Exp $
 
 DISTNAME=      gdk-pixbuf-2.42.12
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -47,10 +47,10 @@ PLIST_VARS+=                native
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
 
-TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
-MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
-MESON_CROSS_BINARY.glib-genmarshal+=   ${TOOLBASE:Q}/bin/glib-genmarshal
-MESON_CROSS_BINARY.glib-mkenums+=      ${TOOLBASE:Q}/bin/glib-mkenums
+TOOL_DEPENDS+=                 glib2-tools>=0:../../devel/glib2-tools
+MESON_BINARIES+=               glib-genmarshal glib-mkenums
+MESON_BINARY.glib-genmarshal=  ${TOOLBASE}/bin/glib-genmarshal
+MESON_BINARY.glib-mkenums=     ${TOOLBASE}/bin/glib-mkenums
 
 .else
 

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.210 pkgsrc/x11/gtk3/Makefile:1.211
--- pkgsrc/x11/gtk3/Makefile:1.210      Sun Jan 12 20:35:04 2025
+++ pkgsrc/x11/gtk3/Makefile    Sat Jan 25 10:15:24 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.210 2025/01/12 20:35:04 riastradh Exp $
+# $NetBSD: Makefile,v 1.211 2025/01/25 10:15:24 riastradh Exp $
 
 DISTNAME=      gtk+-3.24.43
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
@@ -52,19 +52,19 @@ INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/fi
 .if ${USE_CROSS_COMPILE:tl} == "yes"
 
 TOOL_DEPENDS+=         glib2>=0:../../devel/glib2
-MESON_CROSS_BINARIES+= glib-compile-resources glib-compile-schemas
-MESON_CROSS_BINARY.glib-compile-resources=     \
+MESON_BINARIES+=       glib-compile-resources glib-compile-schemas
+MESON_BINARY.glib-compile-resources=   \
                        ${TOOLBASE}/bin/glib-compile-resources
-MESON_CROSS_BINARY.glib-compile-schemas=       \
+MESON_BINARY.glib-compile-schemas=     \
                        ${TOOLBASE}/bin/glib-compile-schemas
 
-TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
-MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
-MESON_CROSS_BINARY.glib-genmarshal=    ${TOOLBASE}/bin/glib-genmarshal
-MESON_CROSS_BINARY.glib-mkenums=       ${TOOLBASE}/bin/glib-mkenums
+TOOL_DEPENDS+=                 glib2-tools>=0:../../devel/glib2-tools
+MESON_BINARIES+=               glib-genmarshal glib-mkenums
+MESON_BINARY.glib-genmarshal=  ${TOOLBASE}/bin/glib-genmarshal
+MESON_BINARY.glib-mkenums=     ${TOOLBASE}/bin/glib-mkenums
 
-MESON_CROSS_BINARIES+=                 gdbus-codegen
-MESON_CROSS_BINARY.gdbus-codegen=      ${TOOLS_CMD.gdbus-codegen}
+MESON_BINARIES+=               gdbus-codegen
+MESON_BINARY.gdbus-codegen=    ${TOOLS_CMD.gdbus-codegen}
 
 # wayland-protocols abuses pc_sysrootdir in its .pc files, causing the
 # cross-destdir to be prefixed twice to paths.

Prev by Date: CVS commit: pkgsrc/fonts/harfbuzz
Next by Date: CVS commit: pkgsrc/net/netatalk4
Previous by Thread: CVS commit: pkgsrc/fonts/harfbuzz
Next by Thread: CVS commit: pkgsrc/net/netatalk4
Indexes:

Home | Main Index | Thread Index | Old Index