From 8723221607f916f72e7bea17bffc857b8ebb5839 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 22:57:13 +1100 Subject: [PATCH] assimp: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/assimp.mk | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/assimp.mk b/src/assimp.mk index 5326cdcb..eac5ab43 100644 --- a/src/assimp.mk +++ b/src/assimp.mk @@ -6,27 +6,18 @@ $(PKG)_DESCR := Assimp Open Asset Import Library $(PKG)_IGNORE := $(PKG)_VERSION := 3.2 $(PKG)_CHECKSUM := 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := assimp/assimp, v $(PKG)_DEPS := gcc boost -define $(PKG)_UPDATE - $(WGET) -q -O- "https://api.github.com/repos/assimp/assimp/releases" | \ - grep 'tag_name' | \ - $(SED) -n 's,.*tag_name": "v\([0-9][^>]*\)".*,\1,p' | \ - $(SORT) -Vr | \ - head -1 -endef - define $(PKG)_BUILD - mkdir '$(1)/build' - cd '$(1)/build' && $(TARGET)-cmake $(1) \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF \ -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \ - -DASSIMP_BUILD_SAMPLES=OFF \ - -DASSIMP_BUILD_TESTS=OFF - $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 + -DASSIMP_BUILD_SAMPLES=OFF \ + -DASSIMP_BUILD_TESTS=OFF \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \