waf: unpack in build dir and don't install for general use

pull/2067/merge
Tony Theodore 6 years ago
parent 4f21088b48
commit c8ae0e2798

@ -17,12 +17,13 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
$(call PREPARE_PKG_SOURCE,waf,$(BUILD_DIR))
rm -rf '$(1)/waf' '$(1)/waflib'
cd '$(1)' && \
AR='$(TARGET)-ar' \
CC='$(TARGET)-gcc' \
PKGCONFIG='$(TARGET)-pkg-config' \
'$(PREFIX)/$(BUILD)/bin/waf' \
'$(BUILD_DIR)/$(waf_SUBDIR)/waf' \
configure \
-j '$(JOBS)' \
--with-target-platform='win$(BITS)' \
@ -36,7 +37,7 @@ define $(PKG)_BUILD
# disable txt2man and doxygen
$(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' \
-W -Wall -Werror -ansi -pedantic \

@ -10,6 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://waf.io/$($(PKG)_FILE)
$(PKG)_TARGETS := $(BUILD)
$(PKG)_TYPE := source-only
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://waf.io/' | \
@ -17,7 +18,5 @@ define $(PKG)_UPDATE
head -1
endef
define $(PKG)_BUILD_$(BUILD)
mkdir -p '$(PREFIX)/$(BUILD)/bin'
cp '$(1)/waf' '$(PREFIX)/$(BUILD)/bin/waf'
endef
# waf (python) creates a runtime bytecode cache that causes issues
# with packaging - unpack source into build dir and use directly

@ -90,7 +90,6 @@ local BLACKLIST = {
'^usr/share/gtk-doc',
'^usr/[^/]+/share/doc/',
'^usr/[^/]+/share/info/',
'^usr/[^/]+/bin/%.waf%-.*',
-- usr/lib/nonetwork.so and
-- usr/x86_64-unknown-linux-gnu/lib/nonetwork.so
@ -439,7 +438,6 @@ end
local function gitInit()
os.execute('mkdir -p ./usr')
os.execute(GIT .. 'init --quiet')
os.execute('echo .waf* >> ./usr/.git/info/exclude')
end
local function gitTag(name)

Loading…
Cancel
Save