Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pixman] Fix x86 builds not using MSVC #38851

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Conversation

Flole998
Copy link
Contributor

Fixes the #Todo comment in pixman's portfile.cmale

@MonicaLiu0311 MonicaLiu0311 self-assigned this May 22, 2024
@MonicaLiu0311 MonicaLiu0311 added the category:port-bug The issue is with a library, which is something the port should already support label May 22, 2024
@MonicaLiu0311
Copy link
Contributor

MonicaLiu0311 commented May 22, 2024

There are two situations when modifying files under vcpkg/ports/portName:

  1. If a version is released upstream, update the "version" field in vcpkg.json and count "port-version" from 0 (port-version is a field that records changes specific to vcpkg, 0 generally means deleting "port-version" line). Reference: 38214/files.
  2. If the upstream has not released a new version, then after modifying other files, please accumulate the "port-version" value to record this modification. Reference: 37966/files.

Please read the documentation: maintainer guide#versioning.

ports/pixman/portfile.cmake Outdated Show resolved Hide resolved
endif()
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}")
endif()
list(APPEND OPTIONS
-Dmmx=enabled
-Dsse2=enabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this isn't enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently the missing flag breaks the build, so I can remove the CFLAGS on my next attempt and we can see if the CI runs through.

@MonicaLiu0311
Copy link
Contributor

At present, the version information of your commit is inconsistent with your local one:

##[error]Found the following errors:
##[error]versions/p-/pixman.json(2,): error : while parsing versions for pixman from version/p-/pixman.json
0.43.4 is declared with f7e1a97a6af1ad657489f901a6ca14db24652eff, but the local port has a different SHA a4e66badb15b7db89e768b1a1943583bff608b2c.

Please run ./vcpkg x-add-version testPort [--overwrite-version] before each push:

  1. For any file modification under the ports/testPort/ folder, please commit after modification
  2. Run ./vcpkg x-add-version portName to generate a series of version according to your commit info (Add --overwrite-version when generating other than the first time)
  3. Commit verison information again
  4. Push together

--overwrite-version
After the first modification, please run ./vcpkg x-add-version testPort to generate the corresponding json; for subsequent modifications of the same version, please use ./vcpkg x-add-version portName --overwrite-version to update git-tree.

maintainer guide#versioning.

@MonicaLiu0311 MonicaLiu0311 marked this pull request as draft May 28, 2024 09:23
@MonicaLiu0311
Copy link
Contributor

Note: I will be converting your PR to draft status. When you're ready, please revert to "ready for review".

@Flole998
Copy link
Contributor Author

@microsoft-github-policy-service agree company="Flole"

@Flole998 Flole998 marked this pull request as ready for review May 31, 2024 11:18
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Jun 3, 2024
@vicroms vicroms merged commit f62d0f1 into microsoft:master Jun 4, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants