diff --git a/build.sh b/build.sh index fc797467894..12531b6fa33 100755 --- a/build.sh +++ b/build.sh @@ -36,7 +36,7 @@ package_macos() { dylibbundler -cd -of -b -x dist/xemu.app/Contents/MacOS/xemu \ -d ${lib_path}/ \ -p "@executable_path/${lib_rpath}/" \ - -s ${PWD}/macos-libs/${target_arch}/opt/local/libexec/openssl11/lib/ \ + -s ${PWD}/macos-libs/${target_arch}/opt/local/libexec/openssl3/lib/ \ -s ${PWD}/macos-libs/${target_arch}/opt/local/lib/ # Fixup some paths dylibbundler missed @@ -227,7 +227,7 @@ case "$platform" in # Adjust compilation options based on platform fi sys_ldflags='-headerpad_max_install_names' export PKG_CONFIG_PATH="${lib_prefix}/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${lib_prefix}/libexec/openssl11/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${lib_prefix}/libexec/openssl3/lib/pkgconfig" opts="$opts --disable-cocoa --cross-prefix=" postbuild='package_macos' ;; diff --git a/scripts/download-macos-libs.py b/scripts/download-macos-libs.py index e75d886c026..7f45c8002ea 100755 --- a/scripts/download-macos-libs.py +++ b/scripts/download-macos-libs.py @@ -18,7 +18,7 @@ # FIXME: Support multiple mirrors class LibInstaller: - DARWIN_TARGET_X64="darwin_17" # macOS 10.13 + DARWIN_TARGET_X64="darwin_21" # macOS 12.x DARWIN_TARGET_ARM64="darwin_21" # macOS 12.x def __init__(self, arch): @@ -135,7 +135,7 @@ def install_pkg(self, pkg_name): assert extracted_path.startswith(self._extract_path), f'tarball has a global file: {fname}' print(f' [*] Extracting to {self._extract_path}') - tb.extractall(self._extract_path, numeric_owner=True) + subprocess.check_call(["tar", "--numeric-owner", "-C", self._extract_path, "-xf", dst_pkg_filename]) for fpath in tb.getnames(): # FIXME: Symlinks @@ -148,7 +148,7 @@ def install_pkg(self, pkg_name): if l.strip().startswith('prefix'): new_prefix = f'prefix={self._extract_path}/opt/local\n' if pkg_name.startswith('openssl'): # FIXME - new_prefix = f'prefix={self._extract_path}/opt/local/libexec/openssl11\n' + new_prefix = f'prefix={self._extract_path}/opt/local/libexec/openssl3\n' lines[i] = new_prefix break with open(extracted_path, 'w') as f: @@ -185,7 +185,7 @@ def main(): 'libsamplerate', 'libpixman', 'libepoxy', - 'openssl11', + 'openssl3', 'libpcap', 'libslirp'])