[meson|scripts] update scripts by Neumann-A · Pull Request #12945 · microsoft/vcpkg

Neumann-A · 2020-08-16T22:56:16Z

use native/cross files for meson and make crossbuilds on windows work

depends

[meson 0.56] Cannot handle spaces in [binaries] paths / string index out of range in ninjabackend.py mesonbuild/meson#7977

Neumann-A · 2020-08-20T21:18:53Z

seems like a merged the wrong branch here once. The expat changes shouldn't be in here.

Neumann-A · 2020-11-13T12:59:26Z

Current error:

Traceback (most recent call last):
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\mesonmain.py", line 140, in run
    return options.run_func(options)
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\msetup.py", line 253, in run
    app.generate()
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\msetup.py", line 161, in generate
    self._generate(env)
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\msetup.py", line 223, in _generate
    intr.backend.generate()
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\backend\ninjabackend.py", line 533, in generate
    self.write_rules(outfile)
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\backend\ninjabackend.py", line 1122, in write_rules
    b.count_rule_references()
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\backend\ninjabackend.py", line 342, in count_rule_references
    if self._should_use_rspfile():
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\backend\ninjabackend.py", line 336, in _should_use_rspfile
    return self.rule.length_estimate(infilenames,
  File "E:\vcpkg_cache\downloads\tools\meson\meson-0.56.0\mesonbuild\backend\ninjabackend.py", line 273, in length_estimate
    if chunk[1] == '{':
IndexError: string index out of range

waiting for upstream comment

use native/cross files make arm builds work.

Neumann-A · 2020-11-17T08:32:04Z

something is strange here:
without the changes the following compiles:
[1/5] cc -Imunit_example.p -I. -I../src/3a51af77fd-8670ab3989.clean -Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=c99 -fPIC -MD -MQ munit_example.p/example.c.o -MF munit_example.p/example.c.o.d -o munit_example.p/example.c.o -c ../src/3a51af77fd-8670ab3989.clean/example.c
with these changes there is an error:

[1/5] /Library/Developer/CommandLineTools/usr/bin/cc -Imunit_example.p -I. -I../src/3a51af77fd-8670ab3989.clean -I/Users/vagrant/Data/installed/x64-osx/include -Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=c99 -fPIC -O3 -DNDEBUG -MD -MQ munit_example.p/example.c.o -MF munit_example.p/example.c.o.d -o munit_example.p/example.c.o -c ../src/3a51af77fd-8670ab3989.clean/example.c
FAILED: munit_example.p/example.c.o 
/Library/Developer/CommandLineTools/usr/bin/cc -Imunit_example.p -I. -I../src/3a51af77fd-8670ab3989.clean -I/Users/vagrant/Data/installed/x64-osx/include -Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=c99 -fPIC -O3 -DNDEBUG -MD -MQ munit_example.p/example.c.o -MF munit_example.p/example.c.o.d -o munit_example.p/example.c.o -c ../src/3a51af77fd-8670ab3989.clean/example.c
In file included from ../src/3a51af77fd-8670ab3989.clean/example.c:11:
../src/3a51af77fd-8670ab3989.clean/munit.h:29:10: fatal error: 'stdlib.h' file not found
#include <stdlib.h>
         ^~~~~~~~~~
1 error generated.

for me the cmd line looks virtually the same except that instead of only cc the full path to /Library/Developer/CommandLineTools/usr/bin/cc is used (and the extra compiler flags and includes). Can somebody with access to a OSX debug this? I don't understand what is happening here and the osx failure is the only thing blocking this PR. @JackBoosY @strega-nil @BillyONeal

JackBoosY · 2020-11-17T08:49:35Z

@Neumann-A Trying...

JackBoosY · 2020-11-17T09:01:04Z

Same error on osx machine by manually run that command:

vcpkg@vcpkg x64-osx-rel %  /Library/Developer/CommandLineTools/usr/bin/cc -Imunit_example.p -I. -I../src/3a51af77fd-8670ab3989.clean -I/Users/vcpkg/Documents/vcpkg/12945/vcpkg/installed/x64-osx/include -Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=c99 -fPIC -O3 -DNDEBUG -MD -MQ munit_example.p/example.c.o -MF munit_example.p/example.c.o.d -o munit_example.p/example.c.o -c ../src/3a51af77fd-8670ab3989.clean/example.c
In file included from ../src/3a51af77fd-8670ab3989.clean/example.c:11:
../src/3a51af77fd-8670ab3989.clean/munit.h:29:10: fatal error: 'stdlib.h' file not found
#include <stdlib.h>
         ^~~~~~~~~~
1 error generated.

@strega-nil Can you please take a look?

scripts/cmake/vcpkg_configure_meson.cmake

- rename internal functions to be prefixed with _vcpkg_ - fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd

strega-nil

I'd like to see these changes made then I'll merge, thanks @Neumann-A :)

scripts/cmake/vcpkg_configure_meson.cmake

strega-nil · 2020-11-18T19:09:28Z

scripts/cmake/vcpkg_configure_meson.cmake

+            message(FATAL_ERROR "Unsupported host architecture ${BUILD_ARCH}!" )
+        endif()
+    else() # TODO: add correct detection for OSX and Linux. Currently only x64 triplets are available in official vcpkg. 
+        set(BUILD_CPU_FAM x86_x64)


Note to self: I have to fix this soon yay

scripts/cmake/vcpkg_find_acquire_program.cmake

strega-nil · 2020-11-18T21:36:42Z

Thanks so much @Neumann-A ! You've put a ton of work into making this a better experience and we really appreciate it 😄

c72578 · 2020-11-19T02:42:56Z

Just for the records:
The meson version used in vcpkg is now at this commit of the master branch:
mesonbuild/meson@91876b4

Neumann-A · 2020-11-19T12:04:41Z

@c72578 yeah I had to restore to using some fixed commit of meson/master since meson seems to be horribly unstable and I did not want to wait for 0.61 for this to be merged .... I also considered to somehow add patches to vcpkg_find_acquire_program to patch the mess meson sometimes is.....

NancyLi1013 assigned PhoebeHui Aug 17, 2020

Neumann-A mentioned this pull request Aug 17, 2020

[glib] Use meson build system. #11477

Closed

PhoebeHui added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Aug 19, 2020

PhoebeHui assigned JackBoosY Aug 19, 2020

JackBoosY requested a review from strega-nil August 20, 2020 02:39

Neumann-A mentioned this pull request Aug 24, 2020

[harfbuzz] Use meson and update to 2.7.0 #12860

Merged

Neumann-A added 5 commits November 13, 2020 19:18

Update meson to a recent commit to fix a bug with 0.56

d13e7c6

rename static libraries built by meson by default on windows

8da84c9

apply cmake variables detection to meson.

e093c17

use native/cross files make arm builds work.

update munit

f774f58

fix fribidi

0aac8c8

Neumann-A force-pushed the make_meson_sane branch from 9bf9f68 to 0aac8c8 Compare November 13, 2020 18:21

fix _FLAGS variables

c57d181

Neumann-A and others added 2 commits November 17, 2020 22:07

set env SDKROOT and MACOSX_DEPLOYMENT_TARGET in configure_meson

eeebd82

need osx env while building and configuring

a6e1450

Neumann-A marked this pull request as ready for review November 18, 2020 17:56

ras0219 reviewed Nov 18, 2020

View reviewed changes

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

Neumann-A added 2 commits November 18, 2020 19:49

- remove unused env backup functions

a91afe5

- rename internal functions to be prefixed with _vcpkg_ - fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd

replace _vcpkg with vcpkg since _ has special meaning in functions

7c29d74

strega-nil suggested changes Nov 18, 2020

View reviewed changes

Neumann-A added 2 commits November 18, 2020 20:16

rename functions to vcpkg_internal_meson_generate

2b327bc

update control tool-meson

95aa141

Neumann-A mentioned this pull request Nov 18, 2020

[vcpkg_get_cmake_vars,meson] Add OSX_SYSROOT for SDKROOT Neumann-A/vcpkg#5

Closed

strega-nil merged commit 3217e25 into microsoft:master Nov 18, 2020

Neumann-A deleted the make_meson_sane branch November 18, 2020 21:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[meson|scripts] update scripts#12945

[meson|scripts] update scripts#12945
strega-nil merged 12 commits intomicrosoft:masterfrom
Neumann-A:make_meson_sane

Neumann-A commented Aug 16, 2020 •

edited

Loading

Uh oh!

Neumann-A commented Aug 20, 2020

Uh oh!

Neumann-A commented Nov 13, 2020

Uh oh!

Neumann-A commented Nov 17, 2020

Uh oh!

JackBoosY commented Nov 17, 2020

Uh oh!

JackBoosY commented Nov 17, 2020

Uh oh!

Uh oh!

strega-nil left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

strega-nil Nov 18, 2020

Uh oh!

Uh oh!

strega-nil commented Nov 18, 2020

Uh oh!

c72578 commented Nov 19, 2020

Uh oh!

Neumann-A commented Nov 19, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Neumann-A commented Aug 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Neumann-A commented Aug 20, 2020

Uh oh!

Neumann-A commented Nov 13, 2020

Uh oh!

Neumann-A commented Nov 17, 2020

Uh oh!

JackBoosY commented Nov 17, 2020

Uh oh!

JackBoosY commented Nov 17, 2020

Uh oh!

Uh oh!

strega-nil left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

strega-nil Nov 18, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

strega-nil commented Nov 18, 2020

Uh oh!

c72578 commented Nov 19, 2020

Uh oh!

Neumann-A commented Nov 19, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Neumann-A commented Aug 16, 2020 •

edited

Loading