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
0d53fcf4
Commit
0d53fcf4
authored
Oct 08, 2010
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: fix pthreads build, it doesn't like MAKEFLAGS=-j4
Force MAKEFLAGS=-j1
parent
d85d6537
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+3
-3
No files found.
extras/contrib/src/Makefile
View file @
0d53fcf4
...
...
@@ -103,10 +103,9 @@ ifneq ($(BUILD),$(HOST))
# We are REALLY cross compiling
FFMPEGCONF
+=
--cross-prefix
=
$(HOST)
-
--enable-cross-compile
X264CONF
=
--host
=
$(HOST)
PTHREADSCONF
=
"CROSS=
$(HOST)
-"
PTHREADSCONF
=
CROSS
=
"
$(HOST)
-"
else
# We are compiling for MinGW on Cygwin
PTHREADSCONF
=
$(HOSTCC)
endif
endif
...
...
@@ -2245,12 +2244,13 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
pthreads
:
pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
$(EXTRACT_GZ)
(
cd
$@
;
patch
-p0
< ../Patches/pthreads-detach.patch
)
sed
-i
's/^CROSS.*=/CROSS ?=/'
$@
/GNUmakefile
ifdef
HAVE_WIN64
(
patch
-p0
< Patches/pthreads-win64.patch
)
endif
.pthreads
:
pthreads
(
cd
$<
;
$(HOSTCC)
make
$(PTHREADSCONF)
GC GC-static
&&
mkdir
-p
$(PREFIX)
/include
&&
cp
-v
pthread.h sched.h semaphore.h
$(PREFIX)
/include/
&&
mkdir
-p
$(PREFIX)
/lib
&&
cp
-v
*
.a
*
.dll
$(PREFIX)
/lib/
)
(
cd
$<
;
$(HOSTCC)
$(PTHREADSCONF)
make
MAKEFLAGS
=
-j1
GC GC-static
&&
mkdir
-p
$(PREFIX)
/include
&&
cp
-v
pthread.h sched.h semaphore.h
$(PREFIX)
/include/
&&
mkdir
-p
$(PREFIX)
/lib
&&
cp
-v
*
.a
*
.dll
$(PREFIX)
/lib/
)
$(INSTALL_NAME)
touch
$@
...
...
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