# HG changeset patch # User Gareth Coco # Date 1324668632 18000 # Node ID bad1e79c931fd75ac9d52c305e0ad47b11ae124f # Parent 861ed76f204141a63df74695d4c69bbd78a58df8 Allow parallel builds in libical. Removed the patch for parallel builds. Added make ical-header before main make. Removed dependency on pthreads. diff -r 861ed76f2041 -r bad1e79c931f src/libical-1-parallel-builds.patch --- a/src/libical-1-parallel-builds.patch Fri Dec 23 19:22:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://freeassociation.svn.sourceforge.net/viewvc/freeassociation/trunk/libical/src/libicalss/CMakeLists.txt?r1=1118&r2=1117&pathrev=1118&diff_format=u - -libical-1-parallel-builds.patch libical-test.c -[gcoco@Basement mingw-cross-env]$ cat src/libical-1-parallel-builds.patch ---- ./src/libicalss/CMakeLists.txt 2011/10/10 23:21:07 1106 -+++ ./src/libicalss/CMakeLists.txt 2011/12/18 21:56:43 1118 -@@ -28,7 +28,9 @@ - ${CMAKE_BINARY_DIR}/src/libical/icalderivedvalue.h - ) - --add_custom_target(icalss-header DEPENDS -+add_custom_target(icalss-header -+ DEPENDS -+ ical-header - ${CMAKE_BINARY_DIR}/src/libicalss/icalss.h - ) diff -r 861ed76f2041 -r bad1e79c931f src/libical.mk --- 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 \