[vlc-devel] [PATCH 1/2] contribs: pthreads: also build the CRT headers

[Martin Storsjö]

On Fri, 5 Oct 2018, Steve Lhomme wrote:

> On 04/10/2018 15:15, Martin Storsjö wrote:
>> On Thu, 4 Oct 2018, Steve Lhomme wrote:
>>
>>> ---
>>> contrib/src/pthreads/rules.mak | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/contrib/src/pthreads/rules.mak 
>>> b/contrib/src/pthreads/rules.mak
>>> index b7d2b57681e..9d762466286 100644
>>> --- a/contrib/src/pthreads/rules.mak
>>> +++ b/contrib/src/pthreads/rules.mak
>>> @@ -18,6 +18,8 @@ pthreads: mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2 
>>> .sum-pthreads
>>>     $(MOVE)
>>>
>>> .pthreads: pthreads
>>> +    cd $</mingw-w64-headers && $(HOSTVARS) ./configure $(HOSTCONF)
>>> +    cd $< && $(MAKE) -C mingw-w64-headers
>>>     cd $</mingw-w64-libraries/winpthreads && $(HOSTVARS) ./configure 
>>> $(HOSTCONF)
>>>     cd $< && $(MAKE) -C mingw-w64-libraries -C winpthreads install
>>>     touch $@
>>> -- 
>>> 2.19.0
>>
>> Please no, this isn't the right solution for the issue we're discussion.
>>
>> For cases where the mingw-w64 headers and import libraries use a 
>> different default msvcrt (ucrtbsae), this will override that and break 
>> everything. The mingw-w64 headers and import libraries should really 
>> come from the same version, otherwise many things will break.
>
> OK, I copied the include/ into x86_64-w64-mingw32/include/ for now. 
> There's never going to be symbolic link on Windows/msys so that's 
> probably the way to go anyway.

Ok. But if you copied instead of moved, some C++ code will break I'm 
afraid.

With today's build you're testing, widl looks in both include and 
x86_64-w64-mingw32/include, but review of that patch suggested I should do 
it differently, so once that gets done properly, widl will look in the 
plain include dir, where the headers are out of the box at the moment.

// Martin