Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 15:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to svgfill/cgal/mpfr/gmp for -shared build on nix

Browse Source
This commit is contained in:
Thomas Krijnen
2022-10-13 09:52:22 +02:00
parent 4cccfd08d3
commit ede9c5fca5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+4 -4
View File
@@ -634,7 +634,7 @@ if "cgal" in targets:
build_dependency( build_dependency(
name=f"gmp-{GMP_VERSION}", name=f"gmp-{GMP_VERSION}",
mode="autoconf", mode="autoconf",
build_tool_args=["--disable-shared", "--with-pic"], build_tool_args=[ENABLE_FLAG, DISABLE_FLAG, "--with-pic"],
download_url="https://ftp.gnu.org/gnu/gmp/", download_url="https://ftp.gnu.org/gnu/gmp/",
download_name=f"gmp-{GMP_VERSION}.tar.bz2" download_name=f"gmp-{GMP_VERSION}.tar.bz2"
) )
@@ -642,7 +642,7 @@ if "cgal" in targets:
build_dependency( build_dependency(
name=f"mpfr-{MPFR_VERSION}", name=f"mpfr-{MPFR_VERSION}",
mode="autoconf", mode="autoconf",
build_tool_args=["--disable-shared", f"--with-gmp={DEPS_DIR}/install/gmp-{GMP_VERSION}"], build_tool_args=[ENABLE_FLAG, DISABLE_FLAG, f"--with-gmp={DEPS_DIR}/install/gmp-{GMP_VERSION}"],
download_url=f"http://www.mpfr.org/mpfr-{MPFR_VERSION}/", download_url=f"http://www.mpfr.org/mpfr-{MPFR_VERSION}/",
download_name=f"mpfr-{MPFR_VERSION}.tar.bz2" download_name=f"mpfr-{MPFR_VERSION}.tar.bz2"
) )
@@ -651,9 +651,9 @@ if "cgal" in targets:
name=f"cgal-{CGAL_VERSION}", name=f"cgal-{CGAL_VERSION}",
mode="cmake", mode="cmake",
build_tool_args=[ build_tool_args=[
f"-DGMP_LIBRARIES={DEPS_DIR}/install/gmp-{GMP_VERSION}/lib/libgmp.a", f"-DGMP_LIBRARIES={DEPS_DIR}/install/gmp-{GMP_VERSION}/lib/libgmp.{LIBRARY_EXT}",
f"-DGMP_INCLUDE_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/include", f"-DGMP_INCLUDE_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/include",
f"-DMPFR_LIBRARIES={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib/libmpfr.a" , f"-DMPFR_LIBRARIES={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib/libmpfr.{LIBRARY_EXT}" ,
f"-DMPFR_INCLUDE_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include", f"-DMPFR_INCLUDE_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include",
f"-DBoost_INCLUDE_DIR={DEPS_DIR}/install/boost-{BOOST_VERSION}", f"-DBoost_INCLUDE_DIR={DEPS_DIR}/install/boost-{BOOST_VERSION}",
f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/cgal-{CGAL_VERSION}/", f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/cgal-{CGAL_VERSION}/",