Skip to content

Commit 092f014

Browse files
committed
Attempt to fix universal build
1 parent e0499f0 commit 092f014

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tools/wheels/build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ case $OSTYPE in
3636
lib_dir=dest/runtimes/linux-$ARCH/native
3737
export CIBW_ENVIRONMENT="CFLAGS=-I\$PWD/dest/build/native/include LDFLAGS=-L\$PWD/$lib_dir LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$PWD/$lib_dir"
3838
# Do not include libsasl2 and its dependencies in the resulting wheel.
39-
export CIBW_REPAIR_WHEEL_COMMAND="auditwheel repair --exclude libsasl2.so.3 -w {dest_dir} {wheel}"
39+
export CIBW_REPAIR_WHEEL_COMMAND="auditwheel repair --exclude libsasl2.so.2 --exclude libsasl2.so.3 -w {dest_dir} {wheel}"
4040
;;
4141
darwin*)
4242
os=macos

tools/wheels/install-librdkafka.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ if [[ $OSTYPE == linux* ]]; then
5555
patchelf --set-soname librdkafka_sasl2_3.so.1 --output $LIBDIR/{librdkafka_sasl2_3.so.1,librdkafka.so}
5656
ln -s librdkafka_sasl2_3.so.1 $LIBDIR/librdkafka_sasl2_3.so
5757
fi
58-
ldd $LIBDIR/librdkafka.so.1
58+
for lib in $LIBDIR/librdkafka*.so.1; do
59+
echo $lib
60+
ldd $lib
61+
done
5962

6063
elif [[ $OSTYPE == darwin* ]]; then
6164
# MacOS X

0 commit comments

Comments
 (0)