Skip to content

Commit c306c1c

Browse files
committed
Use prebuild wheel for zxing-cpp
1 parent 968c9fe commit c306c1c

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

build-helper.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,15 @@ if [ "$OS" = "macos" ]; then
3434
rm -rf $HELPER
3535
mkdir -p $HELPER
3636

37-
# Needed to build zxing-cpp properly
38-
export CMAKE_OSX_ARCHITECTURES="arm64;x86_64"
39-
4037
# Export exact versions
4138
poetry export --without-hashes > $HELPER/requirements.txt
4239
grep cryptography $HELPER/requirements.txt > $HELPER/cryptography.txt
4340
grep cffi $HELPER/requirements.txt > $HELPER/cffi.txt
4441
grep pillow $HELPER/requirements.txt > $HELPER/pillow.txt
45-
grep zxing-cpp $HELPER/requirements.txt > $HELPER/zxing-cpp.txt
4642
# Remove non-universal packages
47-
poetry run pip uninstall -y cryptography cffi pillow zxing-cpp
43+
poetry run pip uninstall -y cryptography cffi pillow
4844
# Build cffi from source to get universal build
4945
poetry run pip install --upgrade -r $HELPER/cffi.txt --no-binary cffi
50-
# Build zxing-cpp from source to get universal build
51-
poetry run pip install --upgrade -r $HELPER/zxing-cpp.txt --no-binary zxing-cpp
5246
# Explicitly install pre-build universal build of cryptography
5347
poetry run pip download -r $HELPER/cryptography.txt --platform macosx_10_12_universal2 --only-binary :all: --no-deps --dest $HELPER
5448
poetry run pip install -r $HELPER/cryptography.txt --no-cache-dir --no-index --find-links $HELPER

0 commit comments

Comments
 (0)