diff options
| author | Gareth Coco <garethcoco@gmail.com> | 2011-12-23 19:30:32 (GMT) |
|---|---|---|
| committer | Gareth Coco <garethcoco@gmail.com> | 2011-12-23 19:30:32 (GMT) |
| commit | 4e042112deab10c2c91aa6d85b54d8bbda602733 (patch) | |
| tree | dd7b9d5c78602c272760f774420ea6b64c1fff4d /src | |
| parent | 36ade7a730ed9da51b560d5972fb2bae9e0fdfa2 (diff) | |
| download | mxe-4e042112deab10c2c91aa6d85b54d8bbda602733.zip mxe-4e042112deab10c2c91aa6d85b54d8bbda602733.tar.gz mxe-4e042112deab10c2c91aa6d85b54d8bbda602733.tar.bz2 | |
Allow parallel builds in libical.
Removed the patch for parallel builds.
Added make ical-header before main make.
Removed dependency on pthreads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libical-1-parallel-builds.patch | 20 | ||||
| -rw-r--r-- | src/libical.mk | 9 |
2 files changed, 6 insertions, 23 deletions
diff --git a/src/libical-1-parallel-builds.patch b/src/libical-1-parallel-builds.patch deleted file mode 100644 index 414a7d5..0000000 --- a/src/libical-1-parallel-builds.patch +++ /dev/null @@ -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 --git a/src/libical.mk b/src/libical.mk index 2cd6bc6..8ac10bd 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -9,7 +9,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(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 @@ define $(PKG)_BUILD 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 \ |