diff options
| author | jstebbins <[email protected]> | 2015-01-18 17:25:51 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-01-18 17:25:51 +0000 |
| commit | d972a8646edc79e7f4e373c51dc2fb77233989f2 (patch) | |
| tree | 9dfa9dd68cc8d4141f2b573d726f949bdc28a8ab /make | |
| parent | 9250daa1b69db695007f2b43ae19ec2d66112ef9 (diff) | |
Work around fedora mingw pthread library requirement
Fedora mingw seems to require it's own pthread library which causes build
conflicts with our pthread lib. So this patch distinguishes whether
libpthread or libpthreadGC2 is already installed on the system and uses
the appropriate system lib when found.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6766 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 5 | ||||
| -rw-r--r-- | make/include/main.defs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/make/configure.py b/make/configure.py index 1bac0874f..e1e8e4d66 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1541,7 +1541,8 @@ int main () return 0; } """ - pthread = LDProbe( 'static pthread', '%s -static' % Tools.gcc.pathname, '-lpthreadGC2', pthread_test ) + pthreadGC2 = LDProbe( 'static pthread', '%s -static' % Tools.gcc.pathname, '-lpthreadGC2', pthread_test ) + pthread = LDProbe( 'static pthread', '%s -static' % Tools.gcc.pathname, '-lpthread', pthread_test ) pthread.run() bz2_test = """ @@ -1733,6 +1734,8 @@ int main() doc.add( 'HAS.dlfcn', 1 ) if not pthread.fail: doc.add( 'HAS.pthread', 1 ) + if not pthreadGC2.fail: + doc.add( 'HAS.pthreadGC2', 1 ) if not bz2.fail: doc.add( 'HAS.bz2', 1 ) if not libz.fail: diff --git a/make/include/main.defs b/make/include/main.defs index 4aa659c6e..56db40c4d 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -69,9 +69,11 @@ MODULES += contrib/libbluray ifneq (,$(filter $(BUILD.system),mingw)) ifneq ($(HAS.pthread),1) +ifneq ($(HAS.pthreadGC2),1) MODULES += contrib/pthreadw32 endif endif +endif ifeq (1,$(FEATURE.qsv)) MODULES += contrib/libmfx |