From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 74784 invoked by alias); 2 Apr 2019 17:22:00 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 74680 invoked by uid 89); 2 Apr 2019 17:21:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_JMF_BL autolearn=ham version=3.3.1 spammy=DESCRIPTION X-HELO: rgout05.bt.lon5.cpcloud.co.uk Received: from rgout0502.bt.lon5.cpcloud.co.uk (HELO rgout05.bt.lon5.cpcloud.co.uk) (65.20.0.223) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 Apr 2019 17:21:58 +0000 X-OWM-Source-IP: 31.51.207.0 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-SNCR-VADESECURE: CLEAN Received: from localhost.localdomain (31.51.207.0) by rgout05.bt.lon5.cpcloud.co.uk (9.0.019.26-1) (authenticated as jonturney@btinternet.com) id 5C24804F09312BF0; Tue, 2 Apr 2019 18:21:56 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport 1/2] meson: use auto-features option Date: Tue, 02 Apr 2019 17:22:00 -0000 Message-Id: <20190402172139.37384-2-jon.turney@dronecode.org.uk> In-Reply-To: <20190402172139.37384-1-jon.turney@dronecode.org.uk> References: <20190402172139.37384-1-jon.turney@dronecode.org.uk> X-SW-Source: 2019-04/txt/msg00001.txt.bz2 This option added in 0.47 [1], is intended to be used by distribution packaging to ensure that features for a package are explicitly configured. (e.g see discussion at [2]) (Note that features are a relatively recent meson feature and thus aren't used by some packages) [1] http://mesonbuild.com/Release-notes-for-0-47-0.html#new-type-of-build-option-for-features [2] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SVURE6JRDBTFKHJAPFBYRZ62JQ56OLEG/ --- cygclass/meson.cygclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cygclass/meson.cygclass b/cygclass/meson.cygclass index 1d2694c..2490cd6 100644 --- a/cygclass/meson.cygclass +++ b/cygclass/meson.cygclass @@ -53,7 +53,7 @@ inherit ninja # cygmeson should be run in the directory containing the top-level meson.build. #**** cygmeson() { - local crossargs mdir + local crossargs mdir meson_version if [ ! -e meson.build ] then @@ -75,6 +75,12 @@ cygmeson() { check_prog_req meson + meson_version=$(meson --version) + if ! __version_at_least 0.47 ${meson_version} + then + error "meson.cygclass: minimum supported meson version is 0.47" + fi + #****v* cygmeson/CYGMESON_ARGS # DESCRIPTION # Additional flags to pass to meson, as a string. @@ -86,6 +92,7 @@ cygmeson() { --localstatedir=$(__host_localstatedir) \ --sysconfdir=$(__host_sysconfdir) \ --buildtype=plain --wrap-mode=nodownload \ + --auto-features=enabled \ ${crossargs} ${CYGMESON_ARGS} "${@}" ${CHOST} \ || error "meson failed" } -- 2.17.0