[vlc-commits] [Git][videolan/vlc][master] contrib: pthread: don't rebuild winpthread

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
de493a1d by Steve Lhomme at 2022-02-26T16:24:57+00:00
contrib: pthread: don't rebuild winpthread

We don't have any local patch for this library.

A normal mingw-w64 install has both libpthread.a and libpthread.dll.a, contribs
will use the former.

- - - - -


2 changed files:

- contrib/src/main.mak
- contrib/src/pthreads/rules.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -131,6 +131,7 @@ ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E
 HAVE_MINGW_W64 := 1
 MINGW_W64_VERSION := $(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E 'define\s__MINGW64_VERSION_MAJOR' | sed -e 's/\#define\s__MINGW64_VERSION_MAJOR\s//')
 HAVE_MINGW64_V8 := $(shell [ $(MINGW_W64_VERSION) -gt 7 ] && echo true)
+HAVE_WINPTHREAD := $(shell $(CC) $(CFLAGS) -E -dM -include pthread.h - < /dev/null >/dev/null 2>&1 || echo FAIL)
 endif
 ifndef HAVE_CROSS_COMPILE
 LN_S = cp -R


=====================================
contrib/src/pthreads/rules.mak
=====================================
@@ -18,6 +18,9 @@ PKGS_ALL += dxvahd dcomp
 ifeq ($(HAVE_MINGW64_V8),true)
 PKGS_FOUND += winrt_headers dxvahd
 endif
+ifeq ($(HAVE_WINPTHREAD),)
+PKGS_FOUND += pthreads
+endif
 endif
 endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/de493a1d254468296c89d1fbb8163dd8820a744e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/de493a1d254468296c89d1fbb8163dd8820a744e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance