Attachment 214774 Details for Bug 246675 – Patch for meson

[patch] Patch for meson

meson-source_path.patch (text/plain), 2.07 KB, created by Daniel Engberg on 2020-05-23 07:26:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-05-23 07:26:46 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
>index 142d8fdf4f90..76b3e64ca94f 100644
>--- a/Mk/Uses/meson.mk
>+++ b/Mk/Uses/meson.mk
>@@ -1,71 +1,74 @@
> # $FreeBSD$
> #
> # Provide support for Meson based projects
> #
> # Feature:		meson
> # Usage:		USES=meson
> #
> # The following files are bundled in source tar files.
> # meson.build		- Instructions for meson like autoconf configure,
> #			there is no changeable parts in the file.
> # meson_options.txt	- All the options meson understands
> #
> # Variables for ports:
> # MESON_ARGS		- Arguments passed to meson
> #			format: -Denable_foo=true
>+# MESON_SOURCE_PATH	- Path to the source directory
>+#			Default: ${WRKSRC}
> # MESON_BUILD_DIR	- Path to the build directory relative to ${WRKSRC}
> #			Default: _build
> #
> # MAINTAINER: gnome@FreeBSD.org
> 
> .if !defined(_INCLUDE_USES_MESON_MK)
> _INCLUDE_USES_MESON_MK=	yes
> 
> # Sanity check
> .if !empty(meson_ARGS)
> IGNORE=	Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
> .endif
> 
> BUILD_DEPENDS+=		meson:devel/meson
> 
> # meson uses ninja
> .include "${USESDIR}/ninja.mk"
> 
> # meson might have issues with non-unicode locales
> USE_LOCALE?=	en_US.UTF-8
> 
> CONFIGURE_ARGS+=	--prefix ${PREFIX} \
> 			--mandir man \
> 			--infodir ${INFO_PATH}
> 
> # meson has it own strip mechanic
> INSTALL_TARGET=		install
> 
> # should we have strip separate from WITH_DEBUG?
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=	--buildtype debug
> .else
> CONFIGURE_ARGS+=	--buildtype release \
> 			--strip
> .endif
> 
> HAS_CONFIGURE=		yes
> CONFIGURE_CMD=		meson
> # Pull in manual set settings and from options
> CONFIGURE_ARGS+=	${MESON_ARGS}
> 
> BUILD_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}
> 
> INSTALL_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}
> 
> TEST_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}
> TEST_TARGET=		test
> 
>+MESON_SOURCE_PATH?=	${WRKSRC}
> MESON_BUILD_DIR?=	_build
> 
> CONFIGURE_LOG=		${MESON_BUILD_DIR}/meson-logs/meson-log.txt
> 
>-# Add meson build dir at the end.
>-CONFIGURE_ARGS+=	${MESON_BUILD_DIR}
>+# Add meson source path and build dir at the end.
>+CONFIGURE_ARGS+=	${MESON_SOURCE_PATH} ${MESON_BUILD_DIR}
> 
> .endif #!defined(_INCLUDE_USES_MESON_MK)

Actions: View | Diff

Attachments on bug 246675: 214774