mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-20 06:58:56 +00:00
last attempt to fix WASM build: libxml2 without threads and use explicit libxml2 paths
This commit is contained in:
+18
-8
@@ -932,17 +932,20 @@ if "libxml2" in targets:
|
|||||||
if MAC_CROSS_COMPILE_INTEL:
|
if MAC_CROSS_COMPILE_INTEL:
|
||||||
OLD_CC = os.environ.get("CC")
|
OLD_CC = os.environ.get("CC")
|
||||||
os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
|
os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
|
||||||
|
build_tool_args=[
|
||||||
|
"--without-python",
|
||||||
|
ENABLE_FLAG,
|
||||||
|
DISABLE_FLAG,
|
||||||
|
"--without-zlib",
|
||||||
|
"--without-iconv",
|
||||||
|
"--without-lzma",
|
||||||
|
]
|
||||||
|
if "wasm" in flags:
|
||||||
|
build_tool_args.append("--without-threads")
|
||||||
build_dependency(
|
build_dependency(
|
||||||
f"libxml2-{LIBXML2_VERSION}",
|
f"libxml2-{LIBXML2_VERSION}",
|
||||||
"autoconf",
|
"autoconf",
|
||||||
build_tool_args=[
|
build_tool_args=build_tool_args,
|
||||||
"--without-python",
|
|
||||||
ENABLE_FLAG,
|
|
||||||
DISABLE_FLAG,
|
|
||||||
"--without-zlib",
|
|
||||||
"--without-iconv",
|
|
||||||
"--without-lzma",
|
|
||||||
],
|
|
||||||
download_url=f"https://download.gnome.org/sources/libxml2/{'.'.join(LIBXML2_VERSION.split('.')[0:2])}/",
|
download_url=f"https://download.gnome.org/sources/libxml2/{'.'.join(LIBXML2_VERSION.split('.')[0:2])}/",
|
||||||
download_name=f"libxml2-{LIBXML2_VERSION}.tar.xz",
|
download_name=f"libxml2-{LIBXML2_VERSION}.tar.xz",
|
||||||
)
|
)
|
||||||
@@ -1290,6 +1293,13 @@ else:
|
|||||||
|
|
||||||
if "libxml2" in targets:
|
if "libxml2" in targets:
|
||||||
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")
|
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")
|
||||||
|
if "wasm" in flags:
|
||||||
|
cmake_args.extend(
|
||||||
|
[
|
||||||
|
f"-DLIBXML2_INCLUDE_DIR={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2",
|
||||||
|
f"-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
if "hdf5" in targets:
|
if "hdf5" in targets:
|
||||||
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/hdf5-{HDF5_VERSION}")
|
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/hdf5-{HDF5_VERSION}")
|
||||||
|
|||||||
Reference in New Issue
Block a user