diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-08-18 06:03:03 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-08-31 02:21:14 (GMT) |
| commit | cd851f6d77677f9f92e321c34f628b0a5ce01139 (patch) | |
| tree | 3e016eb56ae434a8a0dba75aac99a9c574d2d3c6 /src | |
| parent | 822c7e4099ac3e160bcc6cd3a8d788a57b257e01 (diff) | |
| download | mxe-cd851f6d77677f9f92e321c34f628b0a5ce01139.zip mxe-cd851f6d77677f9f92e321c34f628b0a5ce01139.tar.gz mxe-cd851f6d77677f9f92e321c34f628b0a5ce01139.tar.bz2 | |
nsis: use scons-local with python2 and use SOURCE_DIR
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsis.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nsis.mk b/src/nsis.mk index 8a96aec..0747bb7 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 604c011593be484e65b2141c50a018f1b28ab28c994268e4ecd377773f3ff $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := cc +$(PKG)_DEPS := cc scons-local define $(PKG)_UPDATE $(WGET) -q -O- 'https://nsis.sourceforge.io/Download' | \ @@ -18,10 +18,14 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # scons supports -j option but nsis parallel build fails + # nsis uses it's own BUILD_PREFIX which isn't user configurable + mkdir -p '$(BUILD_DIR).scons' + $(call PREPARE_PKG_SOURCE,scons-local,'$(BUILD_DIR).scons') $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script' && \ - $(SED) -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' '$(1)/Source/build.cpp') - cd '$(1)' && scons \ + $(SED) -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' '$(SOURCE_DIR)/Source/build.cpp') + cd '$(SOURCE_DIR)' && $(PYTHON2) '$(BUILD_DIR).scons/scons.py' \ XGCC_W32_PREFIX='$(TARGET)-' \ PREFIX='$(PREFIX)/$(TARGET)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ |