diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-01-07 01:11:21 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-07 01:11:21 (GMT) |
| commit | 967d3a9c0d6a1f5e537e37708673fa240f8fa36d (patch) | |
| tree | 0c8eeea0171e952ceac3c8113f393eed9b0e67be /src | |
| parent | cb8a7deb8fe5259b89ad2e5a986b477fa5808162 (diff) | |
| parent | cd11f46263dc1a3e79d40de7f35c45b2019c0af1 (diff) | |
| download | mxe-967d3a9c0d6a1f5e537e37708673fa240f8fa36d.zip mxe-967d3a9c0d6a1f5e537e37708673fa240f8fa36d.tar.gz mxe-967d3a9c0d6a1f5e537e37708673fa240f8fa36d.tar.bz2 | |
Merge pull request #1129 from LuaAndC/waf
[WIP] add package waf and use it from jack and aubio
Diffstat (limited to 'src')
| -rw-r--r-- | src/aubio.mk | 8 | ||||
| -rw-r--r-- | src/jack.mk | 1 | ||||
| -rw-r--r-- | src/waf.mk | 22 |
3 files changed, 28 insertions, 3 deletions
diff --git a/src/aubio.mk b/src/aubio.mk index 8c7adbe..27f2f68 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8 $(PKG)_SUBDIR := aubio-$($(PKG)_VERSION) $(PKG)_FILE := aubio-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.aubio.org/pub/$($(PKG)_FILE) -$(PKG)_DEPS := gcc ffmpeg fftw jack libsamplerate libsndfile +$(PKG)_DEPS := gcc ffmpeg fftw jack libsamplerate libsndfile waf define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.aubio.org/download' | \ @@ -17,11 +17,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + rm -rf '$(1)/waf' '$(1)/waflib' cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ PKGCONFIG='$(TARGET)-pkg-config' \ - ./waf configure \ + '$(PREFIX)/$(BUILD)/bin/waf' \ + configure \ -j '$(JOBS)' \ --with-target-platform='win$(BITS)' \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -33,7 +35,7 @@ define $(PKG)_BUILD # disable txt2man and doxygen $(SED) -i '/\(TXT2MAN\|DOXYGEN\)/d' '$(1)/build/c4che/_cache.py' - cd '$(1)' && ./waf build install + cd '$(1)' && '$(PREFIX)/$(BUILD)/bin/waf' build install # It is not trivial to adjust the installation in waf-based builds $(if $(BUILD_STATIC), \ diff --git a/src/jack.mk b/src/jack.mk index b13afa9..f09a078 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -17,6 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # TODO: use waf installed by MXE package waf cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ diff --git a/src/waf.mk b/src/waf.mk new file mode 100644 index 0000000..11d7b4c --- /dev/null +++ b/src/waf.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := waf +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.8.17 +$(PKG)_CHECKSUM := 63c53b03dd23afde1008dced06a011dad581d24392818c8069a40af99f6ac2b6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := https://waf.io/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://waf.io/' | \ + $(SED) -n 's,.*waf-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD_$(BUILD) + mkdir -p '$(PREFIX)/$(BUILD)/bin' + cp '$(1)/waf' '$(PREFIX)/$(BUILD)/bin/waf' +endef |