Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
f8aa3950
Commit
f8aa3950
authored
May 29, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libxml2: pthread_join might be available without libpthread
parent
efae70a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
contrib/src/libxml2/pthread.patch
contrib/src/libxml2/pthread.patch
+22
-0
contrib/src/libxml2/rules.mak
contrib/src/libxml2/rules.mak
+1
-0
No files found.
contrib/src/libxml2/pthread.patch
0 → 100644
View file @
f8aa3950
--- libxml2/configure.in.orig 2012-05-29 12:43:39.843757694 -0400
+++ libxml2/configure.in 2012-05-29 12:47:39.347755607 -0400
@@ -913,12 +913,17 @@
echo Enabling multithreaded support
dnl Use pthread by default
if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
+ LIBS_saved="$LIBS"
AC_CHECK_HEADER(pthread.h,
- AC_CHECK_LIB(pthread, pthread_join,[
- THREAD_LIBS="-lpthread"
+ AC_SEARCH_LIBS(pthread_join, pthread,[
+ THREAD_LIBS="$ac_cv_search_pthread_join"
+ if test "$THREAD_LIBS" = "none required"; then
+ THREAD_LIBS=""
+ fi
AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
WITH_THREADS="1"]))
+ LIBS="$LIBS_saved"
fi
case $host_os in
*mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then
contrib/src/libxml2/rules.mak
View file @
f8aa3950
...
@@ -18,6 +18,7 @@ XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --
...
@@ -18,6 +18,7 @@ XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --
libxml2
:
libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
libxml2
:
libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/libxml2/no-tests.patch
$(APPLY)
$(SRC)
/libxml2/no-tests.patch
$(APPLY)
$(SRC)
/libxml2/pthread.patch
$(MOVE)
$(MOVE)
.libxml2
:
libxml2
.libxml2
:
libxml2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment