From de7a2e0b7e07554e94f6d87c37dfbeea26bf25da Mon Sep 17 00:00:00 2001 From: Gyeongjae Choi Date: Thu, 1 Sep 2022 10:00:20 +0900 Subject: [PATCH] Minor build optimizations for libraries (#3047) --- packages/geos/meta.yaml | 1 + packages/glpk/meta.yaml | 6 +++++- packages/libgmp/meta.yaml | 3 +++ packages/libgsl/meta.yaml | 1 + packages/liblzma/meta.yaml | 1 + packages/libmpc/meta.yaml | 2 ++ packages/libmpfr/meta.yaml | 2 ++ packages/libtiff/meta.yaml | 2 ++ packages/libyaml/meta.yaml | 5 ++++- packages/suitesparse/meta.yaml | 16 ++++++++-------- 10 files changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/geos/meta.yaml b/packages/geos/meta.yaml index a3c936cec..8321ae512 100644 --- a/packages/geos/meta.yaml +++ b/packages/geos/meta.yaml @@ -16,6 +16,7 @@ build: -DBUILD_TESTING=OFF \ -DBUILD_BENCHMARKS=OFF \ -DBUILD_DOCUMENTATION=OFF \ + -DBUILD_GEOSOP=OFF \ -DCMAKE_C_FLAGS="-fPIC" \ -DCMAKE_CXX_FLAGS="-fPIC" \ -DCMAKE_PROJECT_INCLUDE=SupportSharedLib.cmake \ diff --git a/packages/glpk/meta.yaml b/packages/glpk/meta.yaml index f9c1ea326..f90120fc2 100644 --- a/packages/glpk/meta.yaml +++ b/packages/glpk/meta.yaml @@ -9,6 +9,10 @@ source: build: library: true script: | - CFLAGS="-fPIC" emconfigure ./configure --prefix=${WASM_LIBRARY_DIR} + CFLAGS="-fPIC" emconfigure ./configure \ + --prefix=${WASM_LIBRARY_DIR} \ + --disable-dependency-tracking \ + --disable-shared \ + --enable-static emmake make -j ${PYODIDE_JOBS:-3} emmake make install diff --git a/packages/libgmp/meta.yaml b/packages/libgmp/meta.yaml index 3b0c9fdcf..05e52079a 100644 --- a/packages/libgmp/meta.yaml +++ b/packages/libgmp/meta.yaml @@ -11,7 +11,10 @@ build: script: | emconfigure ./configure \ CFLAGS="-fPIC" \ + --disable-dependency-tracking \ --host none \ + --disable-shared \ + --enable-static \ --prefix=${WASM_LIBRARY_DIR} emmake make -j ${PYODIDE_JOBS:-3} emmake make install diff --git a/packages/libgsl/meta.yaml b/packages/libgsl/meta.yaml index 95b33042a..8f9624e88 100644 --- a/packages/libgsl/meta.yaml +++ b/packages/libgsl/meta.yaml @@ -10,6 +10,7 @@ build: emconfigure ./configure \ CFLAGS="-fPIC" \ --prefix=${WASM_LIBRARY_DIR} \ + --disable-dependency-tracking \ --disable-shared emmake make -j ${PYODIDE_JOBS:-3} emmake make install diff --git a/packages/liblzma/meta.yaml b/packages/liblzma/meta.yaml index a3d8bf53f..42704c16f 100644 --- a/packages/liblzma/meta.yaml +++ b/packages/liblzma/meta.yaml @@ -19,6 +19,7 @@ build: --disable-scripts \ --disable-doc \ --enable-shared=no \ + --disable-dependency-tracking \ --prefix=${WASM_LIBRARY_DIR} emmake make -j ${PYODIDE_JOBS:-3} diff --git a/packages/libmpc/meta.yaml b/packages/libmpc/meta.yaml index f12c426ef..df9453dc8 100644 --- a/packages/libmpc/meta.yaml +++ b/packages/libmpc/meta.yaml @@ -15,6 +15,8 @@ build: script: | emconfigure ./configure \ CFLAGS="-fPIC" \ + --disable-dependency-tracking \ + --disable-shared \ --with-gmp="${WASM_LIBRARY_DIR}" \ --with-mpfr="${WASM_LIBRARY_DIR}" \ --prefix=${WASM_LIBRARY_DIR} diff --git a/packages/libmpfr/meta.yaml b/packages/libmpfr/meta.yaml index 32c7b9623..be7ef1d4d 100644 --- a/packages/libmpfr/meta.yaml +++ b/packages/libmpfr/meta.yaml @@ -15,6 +15,8 @@ build: script: | emconfigure ./configure \ CFLAGS="-fPIC" \ + --disable-dependency-tracking \ + --disable-shared \ --with-gmp="${WASM_LIBRARY_DIR}" \ --prefix=${WASM_LIBRARY_DIR} emmake make -j ${PYODIDE_JOBS:-3} diff --git a/packages/libtiff/meta.yaml b/packages/libtiff/meta.yaml index 899f99368..d68576abb 100644 --- a/packages/libtiff/meta.yaml +++ b/packages/libtiff/meta.yaml @@ -13,6 +13,8 @@ build: script: | emconfigure ./configure \ CFLAGS="-fPIC" \ + --disable-shared \ + --disable-dependency-tracking \ --prefix=${WASM_LIBRARY_DIR} emmake make -j ${PYODIDE_JOBS:-3} emmake make install diff --git a/packages/libyaml/meta.yaml b/packages/libyaml/meta.yaml index f3fb1eed4..c598b7dcb 100644 --- a/packages/libyaml/meta.yaml +++ b/packages/libyaml/meta.yaml @@ -11,7 +11,10 @@ build: script: | export INSTALL_DIR=${WASM_LIBRARY_DIR} - CFLAGS="-fPIC" emcmake cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} . + CFLAGS="-fPIC" emcmake cmake \ + -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \ + -DBUILD_TESTING=OFF \ + . emmake make -j ${PYODIDE_JOBS:-3} emmake make install rm -f ${INSTALL_DIR}/lib/libyaml.a diff --git a/packages/suitesparse/meta.yaml b/packages/suitesparse/meta.yaml index 8af088e65..5097f833d 100644 --- a/packages/suitesparse/meta.yaml +++ b/packages/suitesparse/meta.yaml @@ -32,12 +32,12 @@ build: INSTALL=${WASM_LIBRARY_DIR} mkdir -p dist - cp ${WASM_LIBRARY_DIR}/lib/libsuitesparseconfig* \ - ${WASM_LIBRARY_DIR}/lib/libamd* \ - ${WASM_LIBRARY_DIR}/lib/libcamd* \ - ${WASM_LIBRARY_DIR}/lib/libccolamd* \ - ${WASM_LIBRARY_DIR}/lib/libcolamd* \ - ${WASM_LIBRARY_DIR}/lib/libmetis* \ - ${WASM_LIBRARY_DIR}/lib/libcholmod* \ - ${WASM_LIBRARY_DIR}/lib/libspqr* \ + cp ${WASM_LIBRARY_DIR}/lib/libsuitesparseconfig.so \ + ${WASM_LIBRARY_DIR}/lib/libamd.so \ + ${WASM_LIBRARY_DIR}/lib/libcamd.so \ + ${WASM_LIBRARY_DIR}/lib/libccolamd.so \ + ${WASM_LIBRARY_DIR}/lib/libcolamd.so \ + ${WASM_LIBRARY_DIR}/lib/libmetis.so \ + ${WASM_LIBRARY_DIR}/lib/libcholmod.so \ + ${WASM_LIBRARY_DIR}/lib/libspqr.so \ dist/