Mercurial > mxe-octave

diff src/libical.mk @ 2191:bad1e79c931f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow parallel builds in libical. Removed the patch for parallel builds. Added make ical-header before main make. Removed dependency on pthreads.
author Gareth Coco <garethcoco@gmail.com>
date Fri, 23 Dec 2011 14:30:32 -0500
parents c1915a09ac58
children f653602a0500
line wrap: on
line diff
--- a/src/libical.mk	Fri Dec 23 19:22:13 2011 +0100
+++ b/src/libical.mk	Fri Dec 23 14:30:32 2011 -0500
@@ -9,7 +9,7 @@
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://freeassociation.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeassociation/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc pthreads
+$(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://sourceforge.net/projects/freeassociation/files/$(PKG)/' | \
@@ -21,9 +21,12 @@
     cd '$(1)' && mkdir build
     cd '$(1)/build' && cmake .. \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DSTATIC_LIBRARY=true
+        -DSTATIC_LIBRARY=true \
+        -DHAVE_PTHREAD_H=false \
+        -DCMAKE_HAVE_PTHREAD_H=false
+    $(MAKE) -C '$(1)/build' -j '$(JOBS)' ical-header
     $(MAKE) -C '$(1)/build' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/build' -j 1 install
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \