diff options
author | Tony Theodore <tonyt@logyst.com> | 2017-03-26 04:56:17 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-26 04:56:17 (GMT) |
commit | 124b4e09485c373439a43e2cf843ad6d21cdd539 (patch) | |
tree | f01a7be2ff2d7e31e2781567e05a48faf21e4198 /src | |
parent | bfc347b211f657efd1e03d526a27c08bc02a68b0 (diff) | |
parent | 1cf2afb5d3afb1dda0d7a5322be758ec2befd2a1 (diff) | |
download | mxe-124b4e09485c373439a43e2cf843ad6d21cdd539.zip mxe-124b4e09485c373439a43e2cf843ad6d21cdd539.tar.gz mxe-124b4e09485c373439a43e2cf843ad6d21cdd539.tar.bz2 |
Merge pull request #1729 from tonytheodore/tag-prefix
github.mk: fix tag prefix with single `v` and pkg name <> project name
Diffstat (limited to 'src')
-rw-r--r-- | src/assimp.mk | 23 | ||||
-rw-r--r-- | src/box2d.mk | 18 | ||||
-rw-r--r-- | src/glfw3.mk | 18 | ||||
-rw-r--r-- | src/glm.mk | 18 | ||||
-rw-r--r-- | src/googlemock.mk | 8 | ||||
-rw-r--r-- | src/googletest.mk | 11 | ||||
-rw-r--r-- | src/hyperscan.mk | 17 | ||||
-rw-r--r-- | src/librosco.mk | 19 | ||||
-rw-r--r-- | src/qtserialport_qt4.mk | 2 |
9 files changed, 38 insertions, 96 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 \ 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 - @@ -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 - 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 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' \ 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' \ 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 |