[vcpkg] Meson osx sysroot #21772

daschuer · 2021-11-30T18:26:10Z

This allows to use VCPKG_OSX_SYSROOT with meson ports. This is required to crosscompile formatconfig for arm64 on osx. Shown here: https://github.com/daschuer/vcpkg/runs/4363816948?check_suite_focus=true

What does your PR fix?
Fixes ignoring VCPKG_OSX_SYSROOT and VCPKG_OSX_ARCHITECTURES when linking meson projects.

This also removes a deprectaion warning and reformats io2d a ffmpeg vcpkg.json to allow updating the version database

Which triplets are supported/not supported? Have you updated the CI baseline?

No change

Does your PR follow the maintainer guide?

Yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 6f60bce..ecfe5e3 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -133,25 +133,25 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "ssh"
+            "dav1d"
           ],
-          "platform": "!(uwp | arm) & !static"
+          "platform": "!(uwp | arm | x86 | osx)"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "opengl"
+            "ssh"
           ],
-          "platform": "!uwp & !(windows & arm)"
+          "platform": "!(uwp | arm) & !static"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "dav1d"
+            "opengl"
           ],
-          "platform": "!(uwp | arm | x86 | osx)"
+          "platform": "!uwp & !(windows & arm)"
         },
         {
           "name": "ffmpeg",
diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json
index 5b494a2..cbe8569 100644
--- a/ports/io2d/vcpkg.json
+++ b/ports/io2d/vcpkg.json
@@ -4,10 +4,6 @@
   "port-version": 4,
   "description": "a lightweight, cross platform drawing library",
   "dependencies": [
-    {
-      "name": "cairo",
-      "platform": "!osx"
-    },
     {
       "name": "cairo",
       "features": [
@@ -15,6 +11,10 @@
       ],
       "platform": "linux"
     },
+    {
+      "name": "cairo",
+      "platform": "!osx"
+    },
     {
       "name": "graphicsmagick",
       "platform": "!osx"

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout c1c6eb92e91b99ca906016499d17088a32137824 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 580a897..4a670fe 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d18225e2ca707165bee0288fe9f1ce59f45b0611",
+      "git-tree": "ca9c704e55efefe1598499ac7c73ec6127d5d3b8",
       "version": "4.4.1",
       "port-version": 2
     },
diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json
index cb6b102..c35f949 100644
--- a/versions/i-/io2d.json
+++ b/versions/i-/io2d.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5aa97bd603c2f6e4f9e79a9d3317b37de833dad0",
+      "git-tree": "120191e188ace7a75192ff41e715f39ddd05a179",
       "version-date": "2020-09-14",
       "port-version": 4
     },

JonLiu1993 · 2021-12-01T06:03:18Z

@daschuer ,Thanks for your pr, this is error log:
https://dev.azure.com/vcpkg/public/_build/results?buildId=63911&view=artifacts&pathAsName=false&type=publishedArtifacts

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5ddd7f02689b7c5aab78711d77f61db5d2e5e79c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json
index 86b2b1e..14da018 100644
--- a/versions/f-/fontconfig.json
+++ b/versions/f-/fontconfig.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "bbe3d54f98efcd8741302799dd5c05cd9d4e19d7",
+      "git-tree": "596967876e9619f66e0bd5e2e58a8bc6c23d8ca8",
       "version": "2.13.94",
       "port-version": 4
     },

JackBoosY · 2021-12-02T09:19:05Z

cc @Neumann-A for simply review this PR.

ports/fontconfig/portfile.cmake

Neumann-A · 2021-12-02T09:33:53Z

scripts/cmake/vcpkg_configure_meson.cmake

+    if(VCPKG_TARGET_IS_OSX)
+        # macOS - append arch and isysroot if cross-compiling
+        if(NOT "${VCPKG_OSX_ARCHITECTURES}" STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
+            foreach(arch IN LISTS VCPKG_OSX_ARCHITECTURES)
+                vcpkg_list(APPEND linker_flags -arch "${arch}")
+            endforeach()
+        endif()
+        if(VCPKG_OSX_SYSROOT)
+            vcpkg_list(APPEND linker_flags -isysroot "${VCPKG_OSX_SYSROOT}")
+        endif()    
+    endif()


the flags should come from CMake instead of being manually added here. (because autotools probably also require them)

The linker flag is already obtained form cmake, see line 152. Unfortunately it does not contain the -sysroot and the -arch parameters. AFAIK, the autotool ports are already working. That is why I have decided for this solution with a limited scope.

I have just double checked the port flatbuffers here
https://github.com/daschuer/vcpkg/actions/runs/1531891431

It already uses -arch and -isysroot as desired. My guess is that the autotools are smart enough to take them form the cxxflags when linking:

37/38] : && /Applications/Xcode_12.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -fPIC -mmacosx-version-min=11.0 -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra -Wno-unused-parameter -O3 -DNDEBUG -arch arm64 -isysroot /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk -mmacosx-version-min=11.0 -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/flatc.dir/src/idl_parser.cpp.o CMakeFiles/flatc.dir/src/idl_gen_text.cpp.o CMakeFiles/flatc.dir/src/reflection.cpp.o CMakeFiles/flatc.dir/src/util.cpp.o CMakeFiles/flatc.dir/src/idl_gen_cpp.cpp.o CMakeFiles/flatc.dir/src/idl_gen_csharp.cpp.o CMakeFiles/flatc.dir/src/idl_gen_dart.cpp.o CMakeFiles/flatc.dir/src/idl_gen_kotlin.cpp.o CMakeFiles/flatc.dir/src/idl_gen_go.cpp.o CMakeFiles/flatc.dir/src/idl_gen_java.cpp.o CMakeFiles/flatc.dir/src/idl_gen_ts.cpp.o CMakeFiles/flatc.dir/src/idl_gen_php.cpp.o CMakeFiles/flatc.dir/src/idl_gen_python.cpp.o CMakeFiles/flatc.dir/src/idl_gen_lobster.cpp.o CMakeFiles/flatc.dir/src/idl_gen_lua.cpp.o CMakeFiles/flatc.dir/src/idl_gen_rust.cpp.o CMakeFiles/flatc.dir/src/idl_gen_fbs.cpp.o CMakeFiles/flatc.dir/src/idl_gen_grpc.cpp.o CMakeFiles/flatc.dir/src/idl_gen_json_schema.cpp.o CMakeFiles/flatc.dir/src/idl_gen_swift.cpp.o CMakeFiles/flatc.dir/src/flatc.cpp.o CMakeFiles/flatc.dir/src/flatc_main.cpp.o CMakeFiles/flatc.dir/src/code_generators.cpp.o CMakeFiles/flatc.dir/grpc/src/compiler/cpp_generator.cc.o CMakeFiles/flatc.dir/grpc/src/compiler/go_generator.cc.o CMakeFiles/flatc.dir/grpc/src/compiler/java_generator.cc.o CMakeFiles/flatc.dir/grpc/src/compiler/python_generator.cc.o CMakeFiles/flatc.dir/grpc/src/compiler/swift_generator.cc.o CMakeFiles/flatc.dir/grpc/src/compiler/ts_generator.cc.o -o flatc && :

My guess is that the autotools are smart enough

no its not, as i recently discovered.

Do you have a build log that verifies it?
I think my build log linkec above, verifies that it is already solved.

I cannot open the posted links even though I have created a discord account. Can you copy the plain text? Which autotools port id affected?

Which auto tool port is affected? If have tested some and all is working fine.

the discord discussion is about libpq but only if the CMAKE_C_COMPILER is correctly set as CC. currently it defaults to gcc instead of correctly using clang on osx. (see #22254)

Unless you do not install the real GNU complier from homebrew or such you have only clang.
Apple provides a gcc and g++ binaries that are only wrappers forwarding the command line to clang.

https://www.quora.com/Why-does-the-gcc-command-on-MacOS-execute-clang

scripts/cmake/vcpkg_configure_meson.cmake

Neumann-A · 2021-12-02T09:36:04Z

scripts/get_cmake_vars/CMakeLists.txt

                foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES)
                    string(APPEND ${flag_var} " -arch ${arch}")
                endforeach()
-                string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}")
            endif()
+            string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}")


this looks like cmake should already be adding the flags (answer to https://github.com/microsoft/vcpkg/pull/21772/files#r760911069 ?)

Unfortunately not. It adds the falgs only to the compiler variable but not to the linker. I am afraid we cannot add it to the linker here, because it might break autotools.

might break autotools.

That is not good enough. It either breaks or it doesn't. And if it breaks the question is: 'why?'

JackBoosY · 2021-12-03T02:32:16Z

Can you please resolve the file confict?

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for fontconfig but no changes to version or port version.
-- Version: 2.13.94#4
-- Old SHA: 41142efe19b6591f0de47857a32fecdb8bbfc717
-- New SHA: eba73bda28f1b3c3cc3b3ee695f67b783b54abfc
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 63e935d967a3410e26bf4a708efa39d8384d2bbb -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json
index 26d12f8..c5d5a8d 100644
--- a/versions/f-/fontconfig.json
+++ b/versions/f-/fontconfig.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "eba73bda28f1b3c3cc3b3ee695f67b783b54abfc",
+      "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494",
       "version": "2.13.94",
       "port-version": 5
     },

Even without crosscompiling it is possible to specify a VCPKG_OSX_SYSROOT or a SDKROOT this should be popagated to autotools and meson builds as well.

…ompile

…tion

cmake appends the -mmacosx-version-min flag c/cxx flags, overriding the value set via VCPKG_C_FLAGS. By setting the environment variable, the VCPKG_C_FLAGS value was used for meson builds. Now the same value is taken for both.

daschuer · 2022-01-15T14:29:17Z

The last commit fixes an issue that a different OSX_DEPLOYMENT_TARGET was used in case it was set via VCPKG_C_FLAGS. It would also be confusing it the VCPKG_DETECTED_CMAKE_C_FLAGS variable does not match the equivalent of cmake ports.

…C_FLAGS This is done in the same way in CMake internally

daschuer · 2022-01-26T07:41:29Z

What kind of responds do you expect? I have explained the pending topic here:
#21772 (comment)

JackBoosY · 2022-01-26T08:52:40Z

What kind of responds do you expect? I have explained the pending topic here: #21772 (comment)

I think we should talk with @Neumann-A since I have less knowledge with meson.
But all configuration tools should use the same amount/content of configuration, why does meson need extra configuration here?

daschuer · 2022-01-28T06:36:32Z

why does meson need extra configuration here?

cmake and autotools are taking -arch and -isysroot from the c flags and pass them to the linker. Meson does not do it.
The cmake behavior is the reason they are not in the linker flags when fetching DETECTED variables form cmake. The autotools behaviour is the reason that we can't manual add them to the fetched cmake variables, because otherwise they are duplicated within autotool builds.

ras0219-msft

Overall, this LGTM with one remaining question:

[adding the flags also to LDFLAGS results in] -arch and -isysroot applied twice.

Is this a problem? If not, I think it would be better to add them to both to avoid meson-specific changes. Or to look at it another way: to avoid autotools-specific omissions in the core helper.

Even if it is a problem, it almost seems like it would be more correct to remove them after the fact in the autotools helper since this is specifically an autotools issue as @Neumann-A pointed out. However I think it would be reasonable to merge this PR as-is and make that larger shuffle later (in this case).

JackBoosY · 2022-02-06T03:22:06Z

Ping @daschuer

daschuer · 2022-02-06T11:04:15Z

However I think it would be reasonable to merge this PR as-is and make that larger shuffle later (in this case).

Let's go with this. And keep the scope of this PR to meson.

* master: (57 commits) [vcpkg-tools] update cmake and git (windows only) (microsoft#22985) Update vcpkg tool to 2022-02-24. (microsoft#23162) [vcpkg baseline] Move cspice headers (microsoft#23272) Fixed inaccurate Chinese words (microsoft#23179) [vcpkg] Add fixed changelog generator. (microsoft#23255) [authentication.md] Add Jenkins section (microsoft#23226) [vcpkg] Meson osx sysroot (microsoft#21772) [pkgconf] enable search for system libs on linux (microsoft#23010) [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218) [lapack-reference] Update to 3.10 (microsoft#23228) [skia] Arm64 for skia on osx (microsoft#23222) [libfido2] Update to 1.10.0 (microsoft#23241) [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061) [libgpiod] Add new port. (microsoft#23221) [drogon] Update to 1.7.5 (microsoft#23227) [tinyexif] Remove from fail list. (microsoft#23163) [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618) [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235) [OpenCV] upgrade to v4.5.5 (microsoft#22801) [libcurl-simple-https] New port (microsoft#22917) ...

github-actions bot requested changes Nov 30, 2021

View reviewed changes

daschuer force-pushed the meson_osx_sysroot branch from f939675 to 0d16a11 Compare November 30, 2021 18:36

github-actions bot approved these changes Nov 30, 2021

View reviewed changes

Cheney-W assigned JonLiu1993 Dec 1, 2021

JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Dec 1, 2021

JonLiu1993 added the requires:author-response label Dec 1, 2021

daschuer force-pushed the meson_osx_sysroot branch from 0d16a11 to 1e25c0a Compare December 1, 2021 10:25

github-actions bot approved these changes Dec 1, 2021

View reviewed changes

PhoebeHui changed the title ~~Meson osx sysroot~~ [vcpkg] Meson osx sysroot Dec 2, 2021

daschuer force-pushed the meson_osx_sysroot branch from 1e25c0a to e6f5a46 Compare December 2, 2021 09:08

github-actions bot requested changes Dec 2, 2021

View reviewed changes

JonLiu1993 removed the requires:author-response label Dec 2, 2021

JonLiu1993 assigned JackBoosY Dec 2, 2021

JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly and removed category:port-bug The issue is with a library, which is something the port should already support labels Dec 2, 2021

Neumann-A reviewed Dec 2, 2021

View reviewed changes

ports/fontconfig/portfile.cmake Outdated Show resolved Hide resolved

Neumann-A reviewed Dec 2, 2021

View reviewed changes

scripts/cmake/vcpkg_configure_meson.cmake Show resolved Hide resolved

Neumann-A reviewed Dec 2, 2021

View reviewed changes

JackBoosY added the requires:author-response label Dec 2, 2021

daschuer force-pushed the meson_osx_sysroot branch from e6f5a46 to b239126 Compare December 2, 2021 19:58

github-actions bot approved these changes Dec 2, 2021

View reviewed changes

daschuer force-pushed the meson_osx_sysroot branch from b239126 to 9cfe253 Compare December 3, 2021 06:49

github-actions bot requested changes Dec 3, 2021

View reviewed changes

daschuer force-pushed the meson_osx_sysroot branch from 9cfe253 to ec064f7 Compare December 3, 2021 06:53

github-actions bot requested changes Dec 3, 2021

View reviewed changes

daschuer force-pushed the meson_osx_sysroot branch from ec064f7 to 47492a6 Compare December 3, 2021 09:10

daschuer added 4 commits January 11, 2022 18:58

[get_cmake_vars] add -isysroot flag independednt of crosscompiling

19d1706

Even without crosscompiling it is possible to specify a VCPKG_OSX_SYSROOT or a SDKROOT this should be popagated to autotools and meson builds as well.

[meson] add -arch and -isysroot to linker flags in case of osx crossc…

4c298e5

…ompile

[meson] avoid DEPRECATION warning about flags in the [properties] sec…

267e8e3

…tion

[meson] don't set OSXROOT evironment varibale

d1f915c

daschuer force-pushed the meson_osx_sysroot branch from 4183e4f to d1f915c Compare January 11, 2022 17:58

github-actions bot approved these changes Jan 11, 2022

View reviewed changes

PhoebeHui mentioned this pull request Jan 12, 2022

[fontconfig] Build error on cross-compile from x64-osx host to arm64-osx target #22498

Closed

github-actions bot approved these changes Jan 15, 2022

View reviewed changes

[meson/make] Add CMAKE_OSX_DEPLOYMENT_TARGET to VCPKG_DETECTED_CMAKE_…

c56c9c1

…C_FLAGS This is done in the same way in CMake internally

github-actions bot approved these changes Jan 15, 2022

View reviewed changes

JackBoosY added the requires:author-response label Jan 19, 2022

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

ras0219-msft approved these changes Feb 2, 2022

View reviewed changes

JackBoosY added requires:author-response and removed requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels Feb 5, 2022

JonLiu1993 requested a review from JackBoosY February 23, 2022 06:14

JonLiu1993 removed the requires:author-response label Feb 23, 2022

JackBoosY approved these changes Feb 23, 2022

View reviewed changes

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Feb 23, 2022

vicroms merged commit a34997a into microsoft:master Feb 24, 2022

kafeg mentioned this pull request Mar 7, 2022

[fontconfig] Fix cross-compile on x64-osx for arm64-osx #23418

Closed

daschuer deleted the meson_osx_sysroot branch January 5, 2023 07:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[vcpkg] Meson osx sysroot #21772

[vcpkg] Meson osx sysroot #21772

daschuer commented Nov 30, 2021 •

edited

Loading

github-actions bot left a comment

JonLiu1993 commented Dec 1, 2021

github-actions bot left a comment

JackBoosY commented Dec 2, 2021

Neumann-A Dec 2, 2021 •

edited

Loading

daschuer Dec 2, 2021

daschuer Dec 2, 2021 •

edited

Loading

Neumann-A Jan 6, 2022

daschuer Jan 7, 2022

daschuer Jan 7, 2022

daschuer Jan 10, 2022

Neumann-A Jan 10, 2022

daschuer Jan 10, 2022

daschuer Jan 10, 2022

Neumann-A Dec 2, 2021

daschuer Dec 2, 2021 •

edited

Loading

Neumann-A Jan 11, 2022

JackBoosY commented Dec 3, 2021

github-actions bot left a comment

github-actions bot left a comment

daschuer commented Jan 15, 2022 •

edited

Loading

daschuer commented Jan 26, 2022

JackBoosY commented Jan 26, 2022

daschuer commented Jan 28, 2022

ras0219-msft left a comment •

edited

Loading

JackBoosY commented Feb 6, 2022

daschuer commented Feb 6, 2022

[vcpkg] Meson osx sysroot #21772

[vcpkg] Meson osx sysroot #21772

Conversation

daschuer commented Nov 30, 2021 • edited Loading

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

github-actions bot left a comment

Choose a reason for hiding this comment

JonLiu1993 commented Dec 1, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

JackBoosY commented Dec 2, 2021

Neumann-A Dec 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daschuer Dec 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daschuer Dec 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JackBoosY commented Dec 3, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

daschuer commented Jan 15, 2022 • edited Loading

daschuer commented Jan 26, 2022

JackBoosY commented Jan 26, 2022

daschuer commented Jan 28, 2022

ras0219-msft left a comment • edited Loading

Choose a reason for hiding this comment

JackBoosY commented Feb 6, 2022

daschuer commented Feb 6, 2022

daschuer commented Nov 30, 2021 •

edited

Loading

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?

Neumann-A Dec 2, 2021 •

edited

Loading

daschuer Dec 2, 2021 •

edited

Loading

daschuer Dec 2, 2021 •

edited

Loading

daschuer commented Jan 15, 2022 •

edited

Loading

ras0219-msft left a comment •

edited

Loading