Skip to content
This repository was archived by the owner on Apr 3, 2023. It is now read-only.

Commit 996c311

Browse files
committed
Tweak Makefile to ensure build logs are visible, and targets match actual outputs.
1 parent c1e9a41 commit 996c311

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

Makefile

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ ARCH=$(shell uname -m)
1010

1111
all:
1212
@echo "***** Building $(PYTHON_VERSION) $(ARCH) build $(BUILD_NUMBER) *****"
13+
rm -rf build
1314
docker build -t beeware/python-linux-$(ARCH)-support .
14-
docker run -e BUILD_NUMBER=$(BUILD_NUMBER) -v $(PROJECT_DIR)/downloads:/local/downloads -v $(PROJECT_DIR)/dist:/local/dist beeware/python-linux-$(ARCH)-support
15+
docker run -e \
16+
BUILD_NUMBER=$(BUILD_NUMBER) \
17+
-v $(PROJECT_DIR)/downloads:/local/downloads \
18+
-v $(PROJECT_DIR)/dist:/local/dist \
19+
-v $(PROJECT_DIR)/build:/local/build \
20+
beeware/python-linux-$(ARCH)-support:$(PYTHON_VER)
1521

1622
# Clean all builds
1723
clean:
@@ -49,10 +55,21 @@ build/Python-$(PYTHON_VERSION)/Makefile: build downloads
4955
# Configure target Python
5056
cd build/Python-$(PYTHON_VERSION) && ./configure \
5157
--prefix=$(PROJECT_DIR)/build/python \
52-
--without-doc-strings --enable-ipv6 --without-ensurepip
53-
54-
build/python/bin/python$(PYTHON_VER)m: build/Python-$(PYTHON_VERSION)/Makefile
55-
cd build/Python-$(PYTHON_VERSION) && make install
58+
--enable-ipv6 \
59+
--enable-shared \
60+
--without-doc-strings \
61+
--without-ensurepip \
62+
2>&1 | tee -a ../python-$(PYTHON_VERSION).config.log
63+
64+
build/Python-$(PYTHON_VERSION)/python.exe: build/Python-$(PYTHON_VERSION)/Makefile
65+
cd build/Python-$(PYTHON_VERSION) && \
66+
make \
67+
2>&1 | tee -a ../python-$(PYTHON_VERSION).build.log
68+
69+
build/python/bin/python$(PYTHON_VER): build/Python-$(PYTHON_VERSION)/python.exe
70+
cd build/Python-$(PYTHON_VERSION) && \
71+
make install \
72+
2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
5673

5774
build/python/VERSIONS: dependencies
5875
echo "Python version: $(PYTHON_VERSION) " > build/python/VERSIONS
@@ -62,7 +79,7 @@ build/python/VERSIONS: dependencies
6279
echo "OpenSSL: $$(awk '$$2=="openssl" { print $$3 }' downloads/system.versions)" >> build/python/VERSIONS
6380
echo "XZ: $$(awk '$$2=="liblzma5:amd64" { print $$3 }' downloads/system.versions)" >> build/python/VERSIONS
6481

65-
dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz: dist build/python/bin/python$(PYTHON_VER)m build/python/VERSIONS
82+
dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz: dist build/python/bin/python$(PYTHON_VER) build/python/VERSIONS
6683
tar zcvf $@ -X exclude.list -C build/python `ls -A build/python`
6784

6885
Python: dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz

0 commit comments

Comments
 (0)