From 1ebd0b563ab48149f995f4854da0f84ddcdb05d8 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 3 Aug 2016 16:48:14 +1000 Subject: libical: use BUILD_DIR etc. --- src/libical.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libical.mk b/src/libical.mk index 658f564..825c979 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -14,14 +14,14 @@ 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)' + + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ -- cgit v0.12 From b77b1253b00f2d453244d2c8416d1041872faf9a Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 3 Aug 2016 16:50:33 +1000 Subject: libical: disable parallel build See: https://github.com/libical/libical/issues/238 https://github.com/libical/libical/issues/233 https://github.com/libical/libical/issues/174 --- src/libical.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libical.mk b/src/libical.mk index 825c979..a378466 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -20,7 +20,9 @@ define $(PKG)_BUILD -DSHARED_ONLY=$(CMAKE_SHARED_BOOL) \ '$(SOURCE_DIR)' - $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + # 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' \ -- cgit v0.12