[vcpkg/meson] fix some details by Neumann-A · Pull Request #15756 · microsoft/vcpkg

Neumann-A · 2021-01-19T12:11:10Z

Add ADD_BIN_TO_PATH to vcpkg_install_meson
Make x86 on x64_x86 a native build (unless uwp)
Make native compiler unuseable in cross builds.
Bonus: Fix single configuration builds.

changes extracted from #13100

deactivate native compiler in cross builds make x86 on x86_x64 a native instead of a cross build (as long as we are not building for UWP)

scripts/buildsystems/meson/none.txt

scripts/cmake/vcpkg_configure_meson.cmake

remove unnecessary comments

JackBoosY · 2021-01-21T03:02:17Z

@ras0219 @ras0219-msft Ping for reivew again.

venabled · 2021-01-22T19:28:22Z

@Neumann-A playing around with this PR as I'm trying to get the glib port working on Android.

It looks like some of the options in the internal meson cross file are getting generated with some spaces inbetween some of the dashes, e.g.:

c_args = ['-g', '-DANDROID', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-D_FORTIFY_SOURCE=2', '-march=armv7-a', '-mthumb', '-Wformat', '-Werror=format-security', '-fPIC', '-', '-target=armv7-none-linux-androideabi21', '-', '-gcc-toolchain=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64', '-', '-sysroot=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot', '-O0', '-fno-limit-debug-info', '-I"/data/vcpkg/installed/arm-android/include"']

Leading to this error during configure:

../src/glib-2-4069d62e51.clean/meson.build:1:0: ERROR: Unable to detect linker for compiler "/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -Wl,--version -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -fPIC - -target=armv7-none-linux-androideabi21 - -gcc-toolchain=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64 - -sysroot=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot -O0 -fno-limit-debug-info -I"/data/vcpkg/installed/arm-android/include""
stdout: 
stderr: clang: error: unknown argument '-target=armv7-none-linux-androideabi21'; did you mean '--target=armv7-none-linux-androideabi21'?
clang: error: unknown argument '-gcc-toolchain=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64'; did you mean '--gcc-toolchain=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64'?
clang: error: unknown argument '-sysroot=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot'; did you mean '--sysroot=/home/venabled/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot'?
clang: error: -E or -x required when input is from standard input
clang: error: -E or -x required when input is from standard input
clang: error: -E or -x required when input is from standard input

scripts/cmake/vcpkg_configure_meson.cmake

JackBoosY · 2021-01-26T07:10:56Z

Ping @Neumann-A @ras0219 for review again.

scripts/cmake/vcpkg_configure_meson.cmake

scripts/cmake/vcpkg_install_meson.cmake

# Conflicts: # scripts/cmake/vcpkg_install_meson.cmake

scripts/cmake/vcpkg_install_meson.cmake

JackBoosY · 2021-02-03T02:08:48Z

/azp run

azure-pipelines · 2021-02-03T02:08:59Z

Azure Pipelines successfully started running 1 pipeline(s).

ras0219-msft

Looks good so far; still needs merge from master due to @post-due's fixes

# Conflicts: # scripts/cmake/vcpkg_configure_meson.cmake

Neumann-A · 2021-02-11T12:43:16Z

@ras0219 Sry, I think you have to re-review. I changed quite a bit in the merge since I was sick of the amount of duplication in the flags code. There is still quite a bit of duplication and I think that maybe the native and cross generators could be merged a bit more in a future PR.
The main problem is that the meson docs are very insufficient in what belongs where and most of the stuff is just me try&erroring it.

JackBoosY · 2021-02-19T02:44:15Z

/azp run

azure-pipelines · 2021-02-19T02:44:28Z

Azure Pipelines successfully started running 1 pipeline(s).

JackBoosY · 2021-02-19T07:35:50Z

Due to my lack of meson knowledge, I prefer @ras0219 @ras0219-msft to review this PR again.

# Conflicts: # scripts/cmake/vcpkg_configure_meson.cmake

JackBoosY · 2021-02-24T03:13:12Z

Ping @ras0219 @ras0219-msft for review this PR again.

ras0219-msft

This generally LGTM. I'll wait to merge until after you've replied to my comments.

ras0219-msft · 2021-03-25T16:21:20Z

scripts/cmake/vcpkg_configure_meson.cmake

+    list(TRANSFORM FLAG_LIST APPEND "'")
+    list(TRANSFORM FLAG_LIST PREPEND "'")
+    list(JOIN FLAG_LIST ", " ${_out_var})
+    string(REPLACE "'', " "" ${_out_var} "${${_out_var}}") # remove empty elements if any


This won't remove a single empty element.

It might be easier to construct this list using string(APPEND) and a foreach loop.

This won't remove a single empty element.

It will remove empty strings "". It should be noted here that the elements are already whitespace striped because otherwise meson will pass them wrongly to the tool invocation.

It might be easier to construct this list using string(APPEND) and a foreach loop.

Yeah I also thought about that but did not want to deal with strange corner cases if there are elements containing ;. So I thought list(TRANSFORM) is a saver approach

ras0219-msft · 2021-03-25T16:24:00Z

scripts/cmake/vcpkg_configure_meson.cmake

    string(APPEND CROSS "cpu = '${BUILD_CPU}'\n")

-    if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS)
+    if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS)


Why the change to MATCHES? It seems like STREQUAL would be better (don't want arm matching arm64)

It is the other way around.
BUILD = arm64 | x64_x86
HOST = arm | x86
arm64 matches arm but not the other way around
the same for x64_x86 which matches x86 but not the other way.

Also if VCPKG_CROSSCOMPILING is a thing now I could use it here.

In that case we should just use TARGET_TRIPLET STREQUAL HOST_TRIPLET

scripts/cmake/vcpkg_configure_meson.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

scripts/cmake/vcpkg_configure_meson.cmake

vicroms

LGTM

Neumann-A added 2 commits January 19, 2021 13:06

[vcpkg_install_meson] add bin to path to run code generators

1415cf4

[vcpkg_configure_meson]

0e414ba

deactivate native compiler in cross builds make x86 on x86_x64 a native instead of a cross build (as long as we are not building for UWP)

Neumann-A mentioned this pull request Jan 19, 2021

[pixman] update to 0.40.0 and switch to meson #15753

Closed

1 task

ras0219 reviewed Jan 19, 2021

View reviewed changes

scripts/buildsystems/meson/none.txt Show resolved Hide resolved

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A marked this pull request as draft January 19, 2021 20:09

JackBoosY self-assigned this Jan 20, 2021

JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Jan 20, 2021

remove double spaces in _FLAGS

ea74740

remove unnecessary comments

Neumann-A marked this pull request as ready for review January 20, 2021 16:35

JackBoosY added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. requires:discussion labels Jan 21, 2021

Neumann-A mentioned this pull request Jan 22, 2021

[glib up to gtk] update and make it work with meson #13100

Merged

3 tasks

ras0219 reviewed Jan 22, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

dan-shaw added the requires:author-response label Jan 25, 2021

Neumann-A added 2 commits January 25, 2021 11:48

Merge remote-tracking branch 'upstream/master' into some_meson_details

b786caa

change regex to take double - into account.

abaf085

JackBoosY removed the requires:author-response label Jan 26, 2021

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

add missing removal of multiple spaces back into the regex

db6f17c

Neumann-A commented Jan 26, 2021

View reviewed changes

scripts/cmake/vcpkg_install_meson.cmake Outdated Show resolved Hide resolved

remove ws diff change

db69b42

JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jan 26, 2021

Neumann-A mentioned this pull request Feb 1, 2021

[meson] fix single-config builds #15937

Merged

Merge remote-tracking branch 'upstream/master' into some_meson_details

dff02cb

# Conflicts: # scripts/cmake/vcpkg_install_meson.cmake

Neumann-A commented Feb 2, 2021

View reviewed changes

scripts/cmake/vcpkg_install_meson.cmake Outdated Show resolved Hide resolved

remove ws to reduce diff

1da6dce

JackBoosY requested a review from ras0219-msft February 4, 2021 08:19

ras0219-msft self-assigned this Feb 4, 2021

ras0219-msft removed the requires:discussion label Feb 4, 2021

Neumann-A mentioned this pull request Feb 9, 2021

[vcpkg] vcpkg_configure_meson: Support macOS cross-compile #15867

Merged

ras0219-msft approved these changes Feb 11, 2021

View reviewed changes

Merge remote-tracking branch 'upstream/master' into some_meson_details

5d66e98

# Conflicts: # scripts/cmake/vcpkg_configure_meson.cmake

JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Feb 18, 2021

JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Feb 19, 2021

JackBoosY requested a review from ras0219-msft February 19, 2021 07:34

Merge remote-tracking branch 'upstream/master' into some_meson_details

eab9254

# Conflicts: # scripts/cmake/vcpkg_configure_meson.cmake

ras0219-msft approved these changes Mar 25, 2021

View reviewed changes

Change macro to function

c25a94f

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

Neumann-A commented Mar 26, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Outdated Show resolved Hide resolved

Neumann-A and others added 2 commits March 26, 2021 11:09

UWP is cross target.

5b8ac64

Merge remote-tracking branch 'upstream/master' into some_meson_details

a58e1fc

vicroms approved these changes Mar 30, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Mar 31, 2021

JackBoosY approved these changes Mar 31, 2021

View reviewed changes

vicroms merged commit 8646c65 into microsoft:master Mar 31, 2021

Neumann-A deleted the some_meson_details branch March 31, 2021 19:00

Conversation

Neumann-A commented Jan 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JackBoosY commented Jan 21, 2021

Uh oh!

venabled commented Jan 22, 2021

Uh oh!

Uh oh!

JackBoosY commented Jan 26, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JackBoosY commented Feb 3, 2021

Uh oh!

azure-pipelines bot commented Feb 3, 2021

Uh oh!

ras0219-msft left a comment

Choose a reason for hiding this comment

Uh oh!

Neumann-A commented Feb 11, 2021

Uh oh!

JackBoosY commented Feb 19, 2021

Uh oh!

azure-pipelines bot commented Feb 19, 2021

Uh oh!

JackBoosY commented Feb 19, 2021

Uh oh!

JackBoosY commented Feb 24, 2021

Uh oh!

ras0219-msft left a comment

Choose a reason for hiding this comment

Uh oh!

ras0219-msft Mar 25, 2021

Choose a reason for hiding this comment

Uh oh!

Neumann-A Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

ras0219-msft Mar 25, 2021

Choose a reason for hiding this comment

Uh oh!

Neumann-A Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

Neumann-A Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

ras0219-msft Mar 31, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vicroms left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Neumann-A commented Jan 19, 2021 •

edited

Loading