Commit 0d53fcf4 authored by Rafaël Carré's avatar Rafaël Carré

contribs: fix pthreads build, it doesn't like MAKEFLAGS=-j4

Force MAKEFLAGS=-j1
parent d85d6537
...@@ -103,10 +103,9 @@ ifneq ($(BUILD),$(HOST)) ...@@ -103,10 +103,9 @@ ifneq ($(BUILD),$(HOST))
# We are REALLY cross compiling # We are REALLY cross compiling
FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile
X264CONF=--host=$(HOST) X264CONF=--host=$(HOST)
PTHREADSCONF="CROSS=$(HOST)-" PTHREADSCONF=CROSS="$(HOST)-"
else else
# We are compiling for MinGW on Cygwin # We are compiling for MinGW on Cygwin
PTHREADSCONF=$(HOSTCC)
endif endif
endif endif
...@@ -2245,12 +2244,13 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz: ...@@ -2245,12 +2244,13 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
(cd $@; patch -p0 < ../Patches/pthreads-detach.patch) (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
sed -i 's/^CROSS.*=/CROSS ?=/' $@/GNUmakefile
ifdef HAVE_WIN64 ifdef HAVE_WIN64
(patch -p0 < Patches/pthreads-win64.patch) (patch -p0 < Patches/pthreads-win64.patch)
endif endif
.pthreads: pthreads .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) $(INSTALL_NAME)
touch $@ touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment