mirror of https://git.wownero.com/dsc/mxe.git
waf: unpack in build dir and don't install for general use
This commit is contained in:
parent
4f21088b48
commit
c8ae0e2798
|
@ -17,12 +17,13 @@ define $(PKG)_UPDATE
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
|
$(call PREPARE_PKG_SOURCE,waf,$(BUILD_DIR))
|
||||||
rm -rf '$(1)/waf' '$(1)/waflib'
|
rm -rf '$(1)/waf' '$(1)/waflib'
|
||||||
cd '$(1)' && \
|
cd '$(1)' && \
|
||||||
AR='$(TARGET)-ar' \
|
AR='$(TARGET)-ar' \
|
||||||
CC='$(TARGET)-gcc' \
|
CC='$(TARGET)-gcc' \
|
||||||
PKGCONFIG='$(TARGET)-pkg-config' \
|
PKGCONFIG='$(TARGET)-pkg-config' \
|
||||||
'$(PREFIX)/$(BUILD)/bin/waf' \
|
'$(BUILD_DIR)/$(waf_SUBDIR)/waf' \
|
||||||
configure \
|
configure \
|
||||||
-j '$(JOBS)' \
|
-j '$(JOBS)' \
|
||||||
--with-target-platform='win$(BITS)' \
|
--with-target-platform='win$(BITS)' \
|
||||||
|
@ -36,7 +37,7 @@ define $(PKG)_BUILD
|
||||||
# disable txt2man and doxygen
|
# disable txt2man and doxygen
|
||||||
$(SED) -i '/\(TXT2MAN\|DOXYGEN\)/d' '$(1)/build/c4che/_cache.py'
|
$(SED) -i '/\(TXT2MAN\|DOXYGEN\)/d' '$(1)/build/c4che/_cache.py'
|
||||||
|
|
||||||
cd '$(1)' && '$(PREFIX)/$(BUILD)/bin/waf' build install
|
cd '$(1)' && '$(BUILD_DIR)/$(waf_SUBDIR)/waf' build install
|
||||||
|
|
||||||
'$(TARGET)-gcc' \
|
'$(TARGET)-gcc' \
|
||||||
-W -Wall -Werror -ansi -pedantic \
|
-W -Wall -Werror -ansi -pedantic \
|
||||||
|
|
|
@ -10,6 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
|
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
|
||||||
$(PKG)_URL := https://waf.io/$($(PKG)_FILE)
|
$(PKG)_URL := https://waf.io/$($(PKG)_FILE)
|
||||||
$(PKG)_TARGETS := $(BUILD)
|
$(PKG)_TARGETS := $(BUILD)
|
||||||
|
$(PKG)_TYPE := source-only
|
||||||
|
|
||||||
define $(PKG)_UPDATE
|
define $(PKG)_UPDATE
|
||||||
$(WGET) -q -O- 'https://waf.io/' | \
|
$(WGET) -q -O- 'https://waf.io/' | \
|
||||||
|
@ -17,7 +18,5 @@ define $(PKG)_UPDATE
|
||||||
head -1
|
head -1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD_$(BUILD)
|
# waf (python) creates a runtime bytecode cache that causes issues
|
||||||
mkdir -p '$(PREFIX)/$(BUILD)/bin'
|
# with packaging - unpack source into build dir and use directly
|
||||||
cp '$(1)/waf' '$(PREFIX)/$(BUILD)/bin/waf'
|
|
||||||
endef
|
|
||||||
|
|
|
@ -90,7 +90,6 @@ local BLACKLIST = {
|
||||||
'^usr/share/gtk-doc',
|
'^usr/share/gtk-doc',
|
||||||
'^usr/[^/]+/share/doc/',
|
'^usr/[^/]+/share/doc/',
|
||||||
'^usr/[^/]+/share/info/',
|
'^usr/[^/]+/share/info/',
|
||||||
'^usr/[^/]+/bin/%.waf%-.*',
|
|
||||||
|
|
||||||
-- usr/lib/nonetwork.so and
|
-- usr/lib/nonetwork.so and
|
||||||
-- usr/x86_64-unknown-linux-gnu/lib/nonetwork.so
|
-- usr/x86_64-unknown-linux-gnu/lib/nonetwork.so
|
||||||
|
@ -439,7 +438,6 @@ end
|
||||||
local function gitInit()
|
local function gitInit()
|
||||||
os.execute('mkdir -p ./usr')
|
os.execute('mkdir -p ./usr')
|
||||||
os.execute(GIT .. 'init --quiet')
|
os.execute(GIT .. 'init --quiet')
|
||||||
os.execute('echo .waf* >> ./usr/.git/info/exclude')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function gitTag(name)
|
local function gitTag(name)
|
||||||
|
|
Loading…
Reference in New Issue