merlimat commented on code in PR #15436:
URL: https://github.com/apache/pulsar/pull/15436#discussion_r865406568


##########
pulsar-client-cpp/python/build-mac-wheels.sh:
##########
@@ -41,77 +42,36 @@ CURL_VERSION=7.61.0
 ROOT_DIR=$(git rev-parse --show-toplevel)
 cd "${ROOT_DIR}/pulsar-client-cpp"
 
-
 # Compile and cache dependencies
 CACHE_DIR=~/.pulsar-mac-wheels-cache
 mkdir -p $CACHE_DIR
 
+if [ ! -d $CACHE_DIR/pyenv ]; then
+  git clone https://github.com/pyenv/pyenv.git $CACHE_DIR/pyenv
+fi
+PYENV=$CACHE_DIR/pyenv/bin/pyenv
+
 cd $CACHE_DIR
 
 PREFIX=$CACHE_DIR/install
 
-###############################################################################
-for line in "${PYTHON_VERSIONS[@]}"; do
-    read -r -a PY <<< "$line"
-    PYTHON_VERSION=${PY[0]}
-    PYTHON_VERSION_LONG=${PY[1]}
-
-    if [ ! -f Python-${PYTHON_VERSION_LONG}/.done ]; then
-      echo "Building Python $PYTHON_VERSION_LONG"
-      curl -O -L 
https://www.python.org/ftp/python/${PYTHON_VERSION_LONG}/Python-${PYTHON_VERSION_LONG}.tgz
-      tar xfz Python-${PYTHON_VERSION_LONG}.tgz
-
-      PY_PREFIX=$CACHE_DIR/py-$PYTHON_VERSION
-      pushd Python-${PYTHON_VERSION_LONG}
-          if [ $PYTHON_VERSION = '3.7' ]; then
-              UNIVERSAL_ARCHS='intel-64'
-              PY_CFLAGS=" -arch x86_64"
-          else
-              UNIVERSAL_ARCHS='universal2'
-          fi
-
-          CFLAGS="-fPIC -O3 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} 
-I${PREFIX}/include ${PY_CFLAGS}" \
-              LDFLAGS=" ${PY_CFLAGS} -L${PREFIX}/lib" \
-              ./configure --prefix=$PY_PREFIX --enable-shared 
--enable-universalsdk --with-universal-archs=${UNIVERSAL_ARCHS}
-          make -j16
-          make install
-
-          curl -O -L 
https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any.whl
-          $PY_PREFIX/bin/pip3 install wheel-*.whl
+export CXXFLAGS=
+export PKG_CONFIG_PATH=
 
-          touch .done
-      popd
-    else
-      echo "Using cached Python $PYTHON_VERSION_LONG"
-    fi
-done
-
-
-###############################################################################
-if [ ! -f zlib-${ZLIB_VERSION}/.done ]; then
-    echo "Building ZLib"
-    curl -O -L https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz
-    tar xvfz zlib-$ZLIB_VERSION.tar.gz
-    pushd zlib-$ZLIB_VERSION
-      CFLAGS="-fPIC -O3 -arch arm64 -arch x86_64 
-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" ./configure --prefix=$PREFIX
-      make -j16
-      make install
-      touch .done
-    popd
-else
-    echo "Using cached ZLib"
-fi
+export SDKROOT=$(xcrun --show-sdk-path)
+export CFLAGS="-DOPENSSL_NO_SSL3 -I${SDKROOT}/usr/include -I${PREFIX}/include"
+export CPPFLAGS="$CFLAGS"
+export LDFLAGS="-L${SDKROOT}/usr/lib -L${PREFIX}/lib"
 
 ###############################################################################
 if [ ! -f openssl-OpenSSL_${OPENSSL_VERSION}.done ]; then
     echo "Building OpenSSL"
     curl -O -L 
https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION}.tar.gz
-    # -arch arm64 -arch x86_64
     tar xvfz OpenSSL_${OPENSSL_VERSION}.tar.gz
     mv openssl-OpenSSL_${OPENSSL_VERSION} 
openssl-OpenSSL_${OPENSSL_VERSION}-arm64
     pushd openssl-OpenSSL_${OPENSSL_VERSION}-arm64
       CFLAGS="-fPIC -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-          ./Configure --prefix=$PREFIX no-shared darwin64-arm64-cc
+          ./Configure --openssldir=$PREFIX --prefix=$PREFIX no-shared 
darwin64-arm64-cc
       make -j8
       make install

Review Comment:
   This could be `install_sw` too



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to