diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-01-08 13:12:24 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-01-08 13:12:24 (GMT) |
| commit | 9ed7e2d92e7bdc3cf884332a00d821eb42f5aad5 (patch) | |
| tree | ac8f7f2233796394ed595e6d92f8465939abb78d /Makefile | |
| parent | 72477c9ac2dd029ce29d0f563492dde408a3093b (diff) | |
| parent | 0edd0899ba948fc2ce775d257eb35c6efc3347f7 (diff) | |
| download | mxe-9ed7e2d92e7bdc3cf884332a00d821eb42f5aad5.zip mxe-9ed7e2d92e7bdc3cf884332a00d821eb42f5aad5.tar.gz mxe-9ed7e2d92e7bdc3cf884332a00d821eb42f5aad5.tar.bz2 | |
Merge pull request #1134 from LuaAndC/fix-patch-tool
reimplement patch-tool-mxe in Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -45,6 +45,7 @@ REQUIREMENTS := autoconf automake autopoint bash bison bzip2 flex \ PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log +GITS_DIR := $(PWD)/gits GIT_HEAD := $(shell git rev-parse HEAD) TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg @@ -154,7 +155,8 @@ endef PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES # use a minimal whitelist of safe environment variables -ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH +# HOME is needed for ~/.gitconfig for patch-tool-mxe +ENV_WHITELIST := PATH HOME LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) @@ -793,3 +795,7 @@ versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) "$($(PKG)_VERSION)",';)} >> $@ @echo ' "": null' >> $@ @echo '}' >> $@ + +# for patch-tool-mxe + +include patch.mk |