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

[vcpkg baseline][dcmtk] Remove the leading spaces of pc file #32049

Merged
merged 3 commits into from
Jun 26, 2023

Conversation

Cheney-W
Copy link
Contributor

@Cheney-W Cheney-W commented Jun 16, 2023

Fixed CI pipeline issue:

dcmtk:x86-windows
dcmtk:x64-windows
dcmtk:x64-windows-static
dcmtk:x64-windows-static-md
CMake Error at scripts/cmake/vcpkg_fixup_pkgconfig.cmake:141 (message):
  D:/downloads/tools/msys2/6f3fa1a12ef85a6f/mingw32/bin/pkg-config.exe
  --exists dcmtk failed with error code: 1
      ENV{PKG_CONFIG_PATH}: "D:/packages/dcmtk_x64-windows-static/lib/pkgconfig;D:/packages/dcmtk_x64-windows-static/share/pkgconfig;D:/installed/x64-windows-static/lib/pkgconfig;D:/installed/x64-windows-static/share/pkgconfig"
      output: Package dcmtk was not found in the pkg-config search path.
  Perhaps you should add the directory containing `dcmtk.pc' to the PKG_CONFIG_PATH environment variable
  Package 'dcmtk', required by 'virtual:world', not found

This issue occurred after the merge of PR #31924. When I tried using the older version of pkg-config, the problem disappeared. I checked the relevant files of dcmtk, and there have been no recent changes to them.

Remove the leading spaces of pc file could fix this issue.

  • 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.

@Cheney-W Cheney-W requested review from jimwang118 and removed request for jimwang118 June 16, 2023 08:49
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Jun 16, 2023
@Neumann-A
Copy link
Contributor

This is simply ignoring the problem instead of fixing it. You need to figure out why pkgconf fails. You need to manually run the command an enable verbose output.

@autoantwort
Copy link
Contributor

Any progress?

@Cheney-W
Copy link
Contributor Author

I have tried the options provided by pkg-config.exe, but they didn't give me more detailed error information.
However, I noticed that there is a space at the beginning of each line in the dcmtk.pc file. If I remove the leading space from the lines mentioned below, it fixes the error.

 Name: DCMTK
 Description: DICOM Toolkit (DCMTK)
 URL: https://dcmtk.org
 Version: 3.6.7

These spaces are from the pc.in file provided by the upstream. In order to maintain consistent formatting, I have removed the leading spaces from each line.

@Cheney-W Cheney-W marked this pull request as ready for review June 26, 2023 10:19
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Jun 26, 2023
@Cheney-W Cheney-W changed the title [vcpkg baseline][dcmtk] Adding SKIP_CHECK for vcpkg_fixup_pkgconfig() [vcpkg baseline][dcmtk] Remove the leading spaces of pc file Jun 26, 2023
@autoantwort
Copy link
Contributor

@Cheney-W Have you upstreamed the patch? :)

@Cheney-W
Copy link
Contributor Author

Have you upstreamed the patch? :)

Working...

@vicroms vicroms merged commit a26fc81 into microsoft:master Jun 26, 2023
@vicroms
Copy link
Member

vicroms commented Jun 26, 2023

Thanks for the fix!

@Cheney-W
Copy link
Contributor Author

DCMTK/dcmtk#82

@Cheney-W Cheney-W deleted the Dev/Cheney/dcmtk branch June 27, 2023 01:54
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:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants