From 0c2c6122ffded475d31c8057640751f4903b9aa3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 20 Mar 2017 23:24:27 +1100 Subject: github.mk: fix tag prefix with single `v` fixes #1728 --- github.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/github.mk b/github.mk index cf6edbe..8e6409c 100644 --- a/github.mk +++ b/github.mk @@ -5,6 +5,7 @@ # Archive: # url = //archive/.tar.gz # dir = - +# if starts with a single `v`, it is removed from dir # # Tarball: # url = //tarball//output-file.tar.gz @@ -85,8 +86,9 @@ define MXE_SETUP_GITHUB_BRANCH endef define MXE_SETUP_GITHUB_TAG - $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(PKG)-$($(PKG)_TAG_PREFIX)$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) - $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_REPO)/archive/$(subst $(PKG)-,,$($(PKG)_SUBDIR)).tar.gz) + $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(PKG)-$(if $(call sne,v,$($(PKG)_TAG_PREFIX)),$($(PKG)_TAG_PREFIX))$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) + $(PKG)_TAR_GZ := $(or $($(PKG)_TAR_GZ),$(PKG)-$($(PKG)_TAG_PREFIX)$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) + $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_REPO)/archive/$(subst $(PKG)-,,$($(PKG)_TAR_GZ)).tar.gz) $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_TAG,$($(PKG)_GH_REPO),$($(PKG)_TAG_PREFIX),$($(PKG)_TAG_SUFFIX),$(or $($(PKG)_TAG_FILTER),$(GITHUB_TAG_FILTER)),$($(PKG)_VERSION_SEP))) endef -- cgit v0.12 From 6b40c10316fd1fa5cd46442a24e8bff86bc0b8f9 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 15:54:55 +1100 Subject: github: add check-gh-conf targets to verify updates and downloads --- Makefile | 9 ++++++++- github.mk | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 53d312b..47cc86d 100644 --- a/Makefile +++ b/Makefile @@ -488,6 +488,7 @@ download-only-$(1): download-only-$($(1)_FILE) download-only-$($(1)_FILE):: $(and $($(1)_URL), @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' + @$$(if $$(REMOVE_DOWNLOAD),rm -f '$(PKG_DIR)/$($(1)_FILE)') @if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ $(PRINTF_FMT) '[download]' '$(1)' | $(RTRIM); \ (set -x; $(call DOWNLOAD_PKG_ARCHIVE,$(1))) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ @@ -506,8 +507,14 @@ download-only-$($(1)_FILE):: exit 1; \ fi; \ fi) + +.PHONY: prepare-pkg-source-$(1) +prepare-pkg-source-$(1): download-only-$(1) + rm -rf '$(2)' + mkdir -p '$(2)' + $$(call PREPARE_PKG_SOURCE,$(1),$(2)) endef -$(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) +$(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG))))) # disable networking during build-only rules for reproducibility ifeq ($(findstring darwin,$(BUILD)),) diff --git a/github.mk b/github.mk index 8e6409c..f6aef36 100644 --- a/github.mk +++ b/github.mk @@ -114,3 +114,24 @@ define MXE_GET_GH_TAG | $(SORT) -V | tail -1 endef + +GITHUB_PKGS = $(patsubst %_GH_CONF,%,$(filter %_GH_CONF,$(.VARIABLES))) + +# check-gh-conf : test updates and source directory +# check-gh-conf-dl: removes downloads and tests above + +# a test of many package updates may hit rate limit of 60/hr +# https://developer.github.com/v3/#rate-limiting + +.PHONY: check-gh-conf check-gh-conf-% +check-gh-conf-dl: REMOVE_DOWNLOAD = true +check-gh-conf-dl: MXE_NO_BACKUP_DL = true +check-gh-conf-dl: check-gh-conf +check-gh-conf-pkg-%: check-update-package-% download-only-% + @$(PRINTF_FMT) '[prep-src]' '$(*)' | $(RTRIM) + @($(MAKE) -f '$(MAKEFILE)' 'prepare-pkg-source-$(*)') > /dev/null + @rm -rf '$(call TMP_DIR,$(*))' + +# secondexpansion here since this file is included before pkg makefiles +.SECONDEXPANSION: +check-gh-conf: $$(addprefix check-gh-conf-pkg-,$$(GITHUB_PKGS)) -- cgit v0.12 From 934ad306157f421fd06e681133f0fa4aef7c8f6b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 15:57:46 +1100 Subject: qtserialport_qt4: fix redirect from qtproject --> qt --- src/qtserialport_qt4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtserialport_qt4.mk b/src/qtserialport_qt4.mk index 13dd068..030914f 100644 --- a/src/qtserialport_qt4.mk +++ b/src/qtserialport_qt4.mk @@ -6,7 +6,7 @@ $(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION := 5c3b6cc $(PKG)_CHECKSUM := d49c1cd4bb47706561f52c07d6075bb9931700d3bcae656ef3b6d3db3eb014ab -$(PKG)_GH_CONF := qtproject/qtserialport/qt4-dev +$(PKG)_GH_CONF := qt/qtserialport/qt4-dev $(PKG)_DEPS := gcc qt define $(PKG)_BUILD -- cgit v0.12 From 9698bfb34e5e7e5b7dd515daa4197844d29eeee7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 18:36:14 +1100 Subject: github.mk: fix where package name differs from project name - box2d <> Box2D - glfw3 <> glfw --- github.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/github.mk b/github.mk index f6aef36..a187afc 100644 --- a/github.mk +++ b/github.mk @@ -57,7 +57,8 @@ GITHUB_TAG_FILTER := alpha\|beta\|rc # and looks out of place. # - don't redefine manually set standard variables (FILE, SUBDIR, URL, UPDATE) -GH_REPO = $(subst $(space),/,$(wordlist 1,2,$(subst /,$(space),$(subst $(comma),$(space),$($(PKG)_GH_CONF))))) +GH_OWNER = $(word 1,$(subst /,$(space),$(word 1,$(subst $(comma),$(space),$($(PKG)_GH_CONF))))) +GH_REPO = $(word 2,$(subst /,$(space),$(word 1,$(subst $(comma),$(space),$($(PKG)_GH_CONF))))) GH_BRANCH = $(word 3,$(subst /,$(space),$(word 1,$(subst $(comma),$(space),$($(PKG)_GH_CONF))))) GH_TAG_VARS = $(call rest,$(subst $(comma),$(space)$(__gmsl_aa_magic),$(subst $(space),,$($(PKG)_GH_CONF)))) GH_TAG_PREFIX = $(subst $(__gmsl_aa_magic),,$(word 1,$(GH_TAG_VARS))) @@ -66,6 +67,7 @@ GH_TAG_FILTER = $(subst $(__gmsl_aa_magic),,$(word 3,$(GH_TAG_VARS))) GH_VERSION_SEP = $(subst $(__gmsl_aa_magic),,$(word 4,$(GH_TAG_VARS))) define MXE_SETUP_GITHUB + $(PKG)_GH_OWNER := $(GH_OWNER) $(PKG)_GH_REPO := $(GH_REPO) $(PKG)_BRANCH := $(GH_BRANCH) $(PKG)_TAG_VARS := $(GH_TAG_VARS) @@ -80,16 +82,16 @@ define MXE_SETUP_GITHUB endef define MXE_SETUP_GITHUB_BRANCH - $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(subst /,-,$($(PKG)_GH_REPO))-$($(PKG)_VERSION)) - $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_REPO)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)) - $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_SHA,$($(PKG)_GH_REPO),$($(PKG)_BRANCH))) + $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$($(PKG)_GH_OWNER)-$($(PKG)_GH_REPO)-$($(PKG)_VERSION)) + $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)) + $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_SHA,$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO),$($(PKG)_BRANCH))) endef define MXE_SETUP_GITHUB_TAG - $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$(PKG)-$(if $(call sne,v,$($(PKG)_TAG_PREFIX)),$($(PKG)_TAG_PREFIX))$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) - $(PKG)_TAR_GZ := $(or $($(PKG)_TAR_GZ),$(PKG)-$($(PKG)_TAG_PREFIX)$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) - $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_REPO)/archive/$(subst $(PKG)-,,$($(PKG)_TAR_GZ)).tar.gz) - $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_TAG,$($(PKG)_GH_REPO),$($(PKG)_TAG_PREFIX),$($(PKG)_TAG_SUFFIX),$(or $($(PKG)_TAG_FILTER),$(GITHUB_TAG_FILTER)),$($(PKG)_VERSION_SEP))) + $(PKG)_SUBDIR := $(or $($(PKG)_SUBDIR),$($(PKG)_GH_REPO)-$(if $(call sne,v,$($(PKG)_TAG_PREFIX)),$($(PKG)_TAG_PREFIX))$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) + $(PKG)_TAR_GZ := $(or $($(PKG)_TAR_GZ),$($(PKG)_GH_REPO)-$($(PKG)_TAG_PREFIX)$(subst .,$($(PKG)_VERSION_SEP),$($(PKG)_VERSION))$($(PKG)_TAG_SUFFIX)) + $(PKG)_URL := $(or $($(PKG)_URL),https://github.com/$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO)/archive/$(subst $($(PKG)_GH_REPO)-,,$($(PKG)_TAR_GZ)).tar.gz) + $(PKG)_UPDATE := $(or $($(PKG)_UPDATE),$(call MXE_GET_GH_TAG,$($(PKG)_GH_OWNER)/$($(PKG)_GH_REPO),$($(PKG)_TAG_PREFIX),$($(PKG)_TAG_SUFFIX),$(or $($(PKG)_TAG_FILTER),$(GITHUB_TAG_FILTER)),$($(PKG)_VERSION_SEP))) endef # called with owner/repo,branch @@ -135,3 +137,4 @@ check-gh-conf-pkg-%: check-update-package-% download-only-% # secondexpansion here since this file is included before pkg makefiles .SECONDEXPANSION: check-gh-conf: $$(addprefix check-gh-conf-pkg-,$$(GITHUB_PKGS)) +github-pkgs: $$(GITHUB_PKGS) -- cgit v0.12 From 8e8639965197d80794696693a5e6bdd9e57a851e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 18:46:12 +1100 Subject: box2d glfw3: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/box2d.mk | 18 +++++------------- src/glfw3.mk | 18 ++++++------------ 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/box2d.mk b/src/box2d.mk index d29c7de..737bd1f 100644 --- a/src/box2d.mk +++ b/src/box2d.mk @@ -2,27 +2,19 @@ PKG := box2d $(PKG)_WEBSITE := http://www.box2d.org/ -$(PKG)_DESCR := Box2D $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.1 $(PKG)_CHECKSUM := 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 -$(PKG)_SUBDIR := Box2D-$($(PKG)_VERSION)/Box2D -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/erincatto/Box2D/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := erincatto/Box2D, v $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, erincatto/Box2D) | \ - $(SED) 's,^v,,g' -endef - define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' . \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DBOX2D_INSTALL=ON \ -DBOX2D_BUILD_EXAMPLES=OFF \ -DBOX2D_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \ -DBOX2D_BUILD_SHARED=$(CMAKE_SHARED_BOOL) \ - '$(1)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + '$(SOURCE_DIR)/Box2D' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 endef diff --git a/src/glfw3.mk b/src/glfw3.mk index 89f8312..f19c541 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -6,24 +6,19 @@ $(PKG)_DESCR := GLFW 3.x $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.2 $(PKG)_CHECKSUM := 6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122 -$(PKG)_SUBDIR := glfw-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/glfw/glfw/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := glfw/glfw $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, glfw/glfw) -endef - define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DGLFW_BUILD_EXAMPLES=FALSE \ -DGLFW_BUILD_TESTS=FALSE \ -DGLFW_BUILD_DOCS=FALSE \ -DGLFW_INSTALL_PKG_CONFIG=TRUE \ - -DGLFW_PKG_LIBS='-lopengl32 -lgdi32' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install + -DGLFW_PKG_LIBS='-lopengl32 -lgdi32' \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install # Windows convention: DLLs in bin/, not in lib/, import library is called "libglfw3.dll.a" $(if $(BUILD_SHARED), @@ -35,4 +30,3 @@ define $(PKG)_BUILD '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glfw3.exe' \ `'$(TARGET)-pkg-config' glfw3 --cflags --libs` endef - -- cgit v0.12 From a71ca3cb580851ae7a96db85a91e1ed626fc318d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:13:20 +1100 Subject: glm: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/glm.mk | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/glm.mk b/src/glm.mk index 1fd5282..b1022c2 100644 --- a/src/glm.mk +++ b/src/glm.mk @@ -6,24 +6,16 @@ $(PKG)_DESCR := GLM - OpenGL Mathematics $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.7.6 $(PKG)_CHECKSUM := 872fdea580b69b752562adc60734d7472fd97d5724c4ead585564083deac3953 -$(PKG)_SUBDIR := glm-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/g-truc/glm/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := g-truc/glm $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, g-truc/glm) -endef - define $(PKG)_BUILD - mkdir '$(1).build' - - cd '$(1).build' && $(TARGET)-cmake '$(1)' - - $(MAKE) -C '$(1).build' -j '$(JOBS)' install + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-glm.exe' endef - -- cgit v0.12 From 1e5d0b33a3408145853751b686976743f6ef9c9e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:15:53 +1100 Subject: googlemock googletest: use GH_CONF --- src/googlemock.mk | 8 +------- src/googletest.mk | 11 ++--------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/googlemock.mk b/src/googlemock.mk index 7930c30..bd4a4bd 100644 --- a/src/googlemock.mk +++ b/src/googlemock.mk @@ -6,12 +6,6 @@ $(PKG)_DESCR := Google Mock $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232 -$(PKG)_SUBDIR := googlemock-release-$($(PKG)_VERSION) -$(PKG)_FILE := googlemock-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/googlemock/archive/release-$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := google/googlemock, release- $(PKG)_DEPS := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) - -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, google/googlemock, release-) -endef diff --git a/src/googletest.mk b/src/googletest.mk index 27a7ac0..1b133e7 100644 --- a/src/googletest.mk +++ b/src/googletest.mk @@ -1,5 +1,4 @@ -# This file is part of MXE. -# See index.html for further information. +# This file is part of MXE. See LICENSE.md for licensing information. PKG := googletest $(PKG)_WEBSITE := https://github.com/google/googletest @@ -7,12 +6,6 @@ $(PKG)_DESCR := Google Test $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc -$(PKG)_SUBDIR := $(PKG)-release-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/$(PKG)/archive/release-$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := google/googletest, release- $(PKG)_DEPS := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) - -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, google/googletest, release-) -endef -- cgit v0.12 From bb09a999f60033ceb1afdd675be7c2532ff53d74 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:26:25 +1100 Subject: hyperscan: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/hyperscan.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/hyperscan.mk b/src/hyperscan.mk index 2161aa2..7e6d696 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -6,25 +6,18 @@ $(PKG)_DESCR := Hyperscan $(PKG)_IGNORE := $(PKG)_VERSION := 4.3.2 $(PKG)_CHECKSUM := 6cd5820d6da51d6fe4ab12066d1efd9afecc1bc6fb7d6eca9c98f76fd391dbd5 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_URL := https://github.com/01org/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := 01org/hyperscan, v $(PKG)_DEPS := gcc boost # $(PKG)_NATIVE_DEPS := ragel -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, 01org/hyperscan, v) -endef - define $(PKG)_BUILD - mkdir '$(1).build' # Add the following options to run on (virtual) machine without AVX2 # -DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2" - cd '$(1).build' && '$(TARGET)-cmake' \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DRAGEL='$(PREFIX)/$(BUILD)/bin/ragel' \ - '$(1)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-gcc' \ '$(1)/examples/simplegrep.c' \ -- cgit v0.12 From 0459a11baac6a27bdf983e2d01dac41c0ecee4f2 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:27:54 +1100 Subject: github.mk: update TODO --- github.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/github.mk b/github.mk index a187afc..48e4eb6 100644 --- a/github.mk +++ b/github.mk @@ -11,7 +11,8 @@ # url = //tarball//output-file.tar.gz # dir = -- # -## also third api - `releases` see libass.mk +# TODO: also third api - `releases` see libass.mk +# grep -l 'MXE_GET_GITHUB\|api.github.com\|github.com.*archive' src/*.mk | xargs grep -L 'GH_CONF' # # Filename doesn't matter as we stream the url to a name of our choosing. # -- cgit v0.12 From 8723221607f916f72e7bea17bffc857b8ebb5839 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 22:57:13 +1100 Subject: 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 5326cdc..eac5ab4 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 \ -- cgit v0.12 From be936eb368e03ee108ef38e73f04c05ef87ae38b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 22:57:27 +1100 Subject: librosco: use GH_CONF and BUILD_DIR/SOURCE_DIR --- src/librosco.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/librosco.mk b/src/librosco.mk index d47057f..7924daa 100644 --- a/src/librosco.mk +++ b/src/librosco.mk @@ -5,23 +5,16 @@ $(PKG)_WEBSITE := https://github.com/colinbourassa/librosco/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.11 $(PKG)_CHECKSUM := 48bb2d07c2575f39bdb6cf022889f20bd855eb9100bb19d4e2536a771198e3a4 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/colinbourassa/librosco/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := colinbourassa/librosco,,,v $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, colinbourassa/librosco) -endef - define $(PKG)_BUILD - mkdir '$(1)/build' - cd '$(1)/build' && '$(TARGET)-cmake' .. \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake \ -DENABLE_DOC_INSTALL=off \ - -DENABLE_TESTAPP_INSTALL=off - - $(MAKE) -C '$(1)/build' -j '$(JOBS)' - $(MAKE) -C '$(1)/build' -j 1 install + -DENABLE_TESTAPP_INSTALL=off \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-gcc' $(1)/src/readmems.c \ -o '$(PREFIX)/$(TARGET)/bin/test-librosco.exe' \ -- cgit v0.12 From 1cf2afb5d3afb1dda0d7a5322be758ec2befd2a1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 23:41:33 +1100 Subject: Makefile: explicitly set .DEFAULT_GOAL first target read can be affected by definitions in included files --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47cc86d..9c26d65 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ MXE_LIB_TYPES := static shared MXE_TARGET_LIST := $(strip $(foreach TRIPLET,$(MXE_TRIPLETS),\ $(addprefix $(TRIPLET).,$(MXE_LIB_TYPES)))) MXE_TARGETS := i686-w64-mingw32.static +.DEFAULT_GOAL := all-filtered DEFAULT_MAX_JOBS := 6 SOURCEFORGE_MIRROR := downloads.sourceforge.net @@ -362,9 +363,6 @@ LOOKUP_PKG_RULE = $(strip \ $(call set,LOOKUP_PKG_RULE_,$(1)_$(2)_$(or $(5),$(3)),$(1)_$(2)_$(3))\ $(1)_$(2)_$(3)))) -.PHONY: all -all: all-filtered - # Core packages. override MXE_PLUGIN_DIRS := $(realpath $(TOP_DIR)/src) $(MXE_PLUGIN_DIRS) -- cgit v0.12