diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-08-11 13:14:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 13:14:16 (GMT) |
| commit | 3e4172b8f3e287b3f9f38e8105ab8a5346847736 (patch) | |
| tree | 33d12a0d555600192d2f6bb5719009b0896c8a3f | |
| parent | 4374d5b3c6e1d00be98b33637f112d07c09b858c (diff) | |
| parent | b77b1253b00f2d453244d2c8416d1041872faf9a (diff) | |
| download | mxe-3e4172b8f3e287b3f9f38e8105ab8a5346847736.zip mxe-3e4172b8f3e287b3f9f38e8105ab8a5346847736.tar.gz mxe-3e4172b8f3e287b3f9f38e8105ab8a5346847736.tar.bz2 | |
Merge pull request #1474 from tonytheodore/libical-retry
libical: disable parallel build
| -rw-r--r-- | src/libical.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/libical.mk b/src/libical.mk index 658f564..a378466 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -14,14 +14,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && mkdir build - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \ -DUSE_BUILTIN_TZDATA=true \ - -DSTATIC_ONLY=$(if $(BUILD_STATIC),true,false) \ - -DSHARED_ONLY=$(if $(BUILD_STATIC),false,true) - $(MAKE) -C '$(1)/build' -j '$(JOBS)' - $(MAKE) -C '$(1)/build' -j 1 install + -DSTATIC_ONLY=$(CMAKE_STATIC_BOOL) \ + -DSHARED_ONLY=$(CMAKE_SHARED_BOOL) \ + '$(SOURCE_DIR)' + + # libs are built twice, causing parallel failures + # https://github.com/libical/libical/issues/174 + $(MAKE) -C '$(BUILD_DIR)' -j 1 VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ |