Skip to content

Commit 7c0466e

Browse files
henryyktauvipy
authored andcommitted
Skip cp27-cp27mu builds (due to undefined symbol: PyUnicodeUCS2_AsASCIIString)
1 parent 0cc779c commit 7c0466e

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rabbitmq-c: submodules
2020

2121

2222
rabbitmq-clean:
23+
-(rm -rf $(RABBIT_DIR)/build || true)
2324
-(cd $(RABBIT_DIR) && make clean || echo "warning... rabbitmq-clean failed")
2425

2526
rabbitmq-distclean:

build-manylinux1-wheels.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,35 @@ set -e -x
55
# Install system packages required by our library
66
yum install -y cmake openssl-devel gcc automake
77

8-
# Ensure a fresh build of rabbitmq-c.
9-
(cd /workspace && make submodules)
10-
rm -rf /workspace/rabbitmq-c/build
11-
(cd /workspace && make rabbitmq-c)
12-
138
# Compile wheels
149
for PYBIN in /opt/python/*/bin; do
10+
# cp27-cp27mu builds fail with: undefined symbol: PyUnicodeUCS2_AsASCIIString
11+
if [[ "${PYBIN}" == *"cp27-cp27mu"* ]]; then
12+
continue
13+
fi
14+
15+
# Ensure a fresh build of rabbitmq-c.
16+
rm -rf /workspace/rabbitmq-c/build
1517
(cd /workspace && ${PYBIN}/python setup.py install)
1618
${PYBIN}/pip wheel /workspace/ -w wheelhouse/
1719
done
1820

1921
# Bundle external shared libraries into the wheels
20-
#ls wheelhouse/*
2122
for whl in wheelhouse/*linux*.whl; do
2223
auditwheel repair $whl -w /workspace/wheelhouse/
2324
done
2425

2526
# Install packages and test
2627
for PYBIN in /opt/python/*/bin/; do
27-
# vine 5.0.0a1 breaks python2
28+
if [[ "${PYBIN}" == *"cp27-cp27mu"* ]]; then
29+
continue
30+
fi
31+
32+
# amqp 5.0.0a1 and vine 5.0.0a1 breaks python2
2833
# https://github.com/celery/vine/issues/34
29-
if [[ "$PYBIN" == *"python/cp2"* ]]; then
34+
if [[ "${PYBIN}" == *"python/cp2"* ]]; then
3035
${PYBIN}/pip install --force-reinstall "vine==1.3.0"
36+
${PYBIN}/pip install --force-reinstall "amqp==2.5.2"
3137
fi
3238

3339
${PYBIN}/pip install librabbitmq -f /workspace/wheelhouse

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,9 @@ def run(self):
155155
return
156156

157157
os.chdir('build')
158-
if os.system(cmake + ' ..'):
159-
return
158+
if not os.path.isfile('Makefile'):
159+
if os.system(cmake + ' ..'):
160+
return
160161

161162
if os.system(make + ' rabbitmq rabbitmq-static'):
162163
return

0 commit comments

Comments
 (0)