-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
try fixing x264 #13450
try fixing x264 #13450
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bump version please.
@JackBoosY: Remind me if it is out of draft and i didn't bump it..... until then I'll focus on the bigger picture instead of minor less important details. |
@@ -243,8 +240,14 @@ function(vcpkg_configure_make) | |||
endif() | |||
endif() | |||
debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}") | |||
set(APPEND_ENV ";${MSYS_ROOT}/usr/share/automake-1.16") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unsure if this should be before /usr/bin
or after. The problem here is that /usr/share/automake-1.16
contains an install
script which conflicts with install.exe
in /usr/bin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't quite follow how this PR fixes things; it looks like automake will still come before /usr/bin
and thus will still mask install
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
X264 is not a autoconf port but some custom configure. As such the path with the script is not added to the path variable for the port.
Looks passed. |
Seems also need to update ci.baseline.txt. |
@@ -243,8 +240,14 @@ function(vcpkg_configure_make) | |||
endif() | |||
endif() | |||
debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}") | |||
set(APPEND_ENV ";${MSYS_ROOT}/usr/share/automake-1.16") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be good.
endif() | ||
|
||
string(REPLACE ";$ENV{SystemRoot}\\System32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") | ||
string(REPLACE ";$ENV{SystemRoot}\\system32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this duplicated twice?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not duplicated. Since windows is case insensitive the path can be both ways. I tried a regex with [Ss] and escaping of the \ but cmake never matched it for some reason
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Awesome, thanks! |
will close #13327 if it works.
Current problem:
install.exe
is not installing for some reason@ras0219 @JackBoosY @NancyLi1013 Can somebody figure out why msys
install.exe
is not installing?The logs indicate that the following commands are run:
but the target directories are not created / empty
Hmm i found everything in
E:\vcpkg_cache\downloads\tools\msys2\77f3fd5f29257d6b\E\Repos\vcpkg\packages\x264_x64-windows-static\E\Repos\vcpkg