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

[dirent] update to 1.24 #34043

Merged
merged 11 commits into from
Oct 17, 2023
Merged

[dirent] update to 1.24 #34043

merged 11 commits into from
Oct 17, 2023

Conversation

jiayuehua
Copy link
Contributor

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@FrankXie05
Copy link
Contributor

@jiayuehua So, do you plan to do all simple port updates?

@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Sep 27, 2023
@jiayuehua
Copy link
Contributor Author

no ,I will soon stop.

@jiayuehua jiayuehua marked this pull request as draft September 27, 2023 04:12
@jiayuehua
Copy link
Contributor Author

WIN32 marco to hard to fix

@jiayuehua jiayuehua closed this Sep 28, 2023
@jiayuehua jiayuehua reopened this Sep 28, 2023
@jiayuehua jiayuehua marked this pull request as ready for review October 5, 2023 18:21
FrankXie05
FrankXie05 previously approved these changes Oct 7, 2023
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Oct 7, 2023
@@ -15,6 +15,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
"0013-Check-for-backslash-in-argv-0-on-Windows.patch"
"0014-Define-POSIX-macros-if-missing.patch"
"0015-MSYS2-Remove-ioctl-call.patch"
"0016-Fix-file_famagic-function.patch"
Copy link
Contributor

Choose a reason for hiding this comment

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

This patch only changes WIN32 macros C files. This is normally passed at the command line. Why do we need another patch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have made the patch much smaller. Mainly is fix macro #if S_IFLNK != 0, because libmagic think WIN32 always IS_IFLNK==0, but after libdirent update S_IFLNK is also not zero.

@dg0yt
Copy link
Contributor

dg0yt commented Oct 8, 2023

What I can see from CI logs:
filemagic sets WIN32 during Windows builds, so it doesn't need to be patched out.
But there seems to be a problem with port getopt-win32 because it installs a header which is also provided in-source of many packages as part of the gnulib (gl, not glib) cross platform polyfill:

Importing getopt library
D:\buildtrees\libmagic\src\FILE5_40-612ec1dc40.clean\src\file.c(63): warning C4273: 'getopt_long_a': inconsistent dll linkage
D:\installed\x64-windows\include\getopt.h(100): note: see previous definition of 'getopt_long_a'
...

@FrankXie05 FrankXie05 removed the info:reviewed Pull Request changes follow basic guidelines label Oct 9, 2023
@jiayuehua
Copy link
Contributor Author

What I can see from CI logs: filemagic sets WIN32 during Windows builds, so it doesn't need to be patched out. But there seems to be a problem with port getopt-win32 because it installs a header which is also provided in-source of many packages as part of the gnulib (gl, not glib) cross platform polyfill:

Importing getopt library
D:\buildtrees\libmagic\src\FILE5_40-612ec1dc40.clean\src\file.c(63): warning C4273: 'getopt_long_a': inconsistent dll linkage
D:\installed\x64-windows\include\getopt.h(100): note: see previous definition of 'getopt_long_a'
...

Do you mean port getopt-win32 should not define getopt_long_a to privent linkage issue?

@dg0yt
Copy link
Contributor

dg0yt commented Oct 12, 2023

Do you mean port getopt-win32 should not define getopt_long_a to privent linkage issue?

getopt-win32 may cause installation order problems. But it is a baseline issue, not related to this PR.

@jiayuehua
Copy link
Contributor Author

@FrankXie05 could you please take a look to this pr?

@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Oct 17, 2023
@JavierMatosD JavierMatosD merged commit 91f1776 into microsoft:master Oct 17, 2023
15 checks passed
@jiayuehua jiayuehua deleted the dirent branch October 17, 2023 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants