* [PATCH cygport 0/2] Use meson auto-features option
@ 2019-04-02 17:21 Jon Turney
2019-04-02 17:22 ` [PATCH cygport 2/2] Fixup __version_at_least a bit Jon Turney
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jon Turney @ 2019-04-02 17:21 UTC (permalink / raw)
To: cygwin-apps; +Cc: Jon Turney
Jon Turney (2):
meson: use auto-features option
Fixup __version_at_least a bit
cygclass/meson.cygclass | 9 ++++++++-
lib/check_funcs.cygpart | 6 +++---
2 files changed, 11 insertions(+), 4 deletions(-)
--
2.17.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH cygport 2/2] Fixup __version_at_least a bit
2019-04-02 17:21 [PATCH cygport 0/2] Use meson auto-features option Jon Turney
@ 2019-04-02 17:22 ` Jon Turney
2019-04-02 17:22 ` [PATCH cygport 1/2] meson: use auto-features option Jon Turney
2020-03-24 3:07 ` [PATCH cygport 0/2] Use meson " Yaakov Selkowitz
2 siblings, 0 replies; 4+ messages in thread
From: Jon Turney @ 2019-04-02 17:22 UTC (permalink / raw)
To: cygwin-apps; +Cc: Jon Turney
Use the variables we've made containing the separated version
components, rather than an undefined one
---
lib/check_funcs.cygpart | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart
index 07516be..bb35812 100644
--- a/lib/check_funcs.cygpart
+++ b/lib/check_funcs.cygpart
@@ -699,12 +699,12 @@ __version_at_least() {
local -a have_va=(${have_v//[-\._]/ });
local -i n=0;
- while defined want_ver[${n}]
+ while defined want_va[${n}]
do
- if (( want_ver[n] < ${have_ver[${n}]:-0} ))
+ if (( want_va[n] < ${have_va[${n}]:-0} ))
then
return 0;
- elif (( want_ver[n] > ${have_ver[${n}]:-0} ))
+ elif (( want_va[n] > ${have_va[${n}]:-0} ))
then
return 1;
else
--
2.17.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH cygport 1/2] meson: use auto-features option
2019-04-02 17:21 [PATCH cygport 0/2] Use meson auto-features option Jon Turney
2019-04-02 17:22 ` [PATCH cygport 2/2] Fixup __version_at_least a bit Jon Turney
@ 2019-04-02 17:22 ` Jon Turney
2020-03-24 3:07 ` [PATCH cygport 0/2] Use meson " Yaakov Selkowitz
2 siblings, 0 replies; 4+ messages in thread
From: Jon Turney @ 2019-04-02 17:22 UTC (permalink / raw)
To: cygwin-apps; +Cc: Jon Turney
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH cygport 0/2] Use meson auto-features option
2019-04-02 17:21 [PATCH cygport 0/2] Use meson auto-features option Jon Turney
2019-04-02 17:22 ` [PATCH cygport 2/2] Fixup __version_at_least a bit Jon Turney
2019-04-02 17:22 ` [PATCH cygport 1/2] meson: use auto-features option Jon Turney
@ 2020-03-24 3:07 ` Yaakov Selkowitz
2 siblings, 0 replies; 4+ messages in thread
From: Yaakov Selkowitz @ 2020-03-24 3:07 UTC (permalink / raw)
To: cygwin-apps
On Tue, 2019-04-02 at 18:21 +0100, Jon Turney wrote:
> Jon Turney (2):
> meson: use auto-features option
> Fixup __version_at_least a bit
>
> cygclass/meson.cygclass | 9 ++++++++-
> lib/check_funcs.cygpart | 6 +++---
> 2 files changed, 11 insertions(+), 4 deletions(-)
Pushed to master, please test.
--
Yaakov
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-24 3:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-02 17:21 [PATCH cygport 0/2] Use meson auto-features option Jon Turney
2019-04-02 17:22 ` [PATCH cygport 2/2] Fixup __version_at_least a bit Jon Turney
2019-04-02 17:22 ` [PATCH cygport 1/2] meson: use auto-features option Jon Turney
2020-03-24 3:07 ` [PATCH cygport 0/2] Use meson " Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).