Skip to content

Commit

Permalink
Make the build script more like it was
Browse files Browse the repository at this point in the history
I cannot fathom what I might be doing wrong. upstream/deve builds
seacas just fine. Try to make the way I am building seacas more
like it was, each step of the way.
  • Loading branch information
milljm committed Oct 21, 2024
1 parent a7c9f4c commit a82e27d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions conda/seacas/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ set -eu
# this function is called from conda/functions/retry_build.sh
function do_build(){
export INSTALL_PATH="${PREFIX}/seacas"
rm -rf "${INSTALL_PATH:?}"
rm -rf "${INSTALL_PATH:?}" "${SRC_DIR:?}/build"

# Configure and build options
export BUILD=YES
export GNU_PARALLEL=NO
export H5VERSION=V112
export NEEDS_ZLIB=YES
export JOBS=${MOOSE_JOBS:-2}

# If on macOS, set COMPILER to clang
if [[ $(uname) == Darwin ]]; then
Expand All @@ -25,15 +26,14 @@ function do_build(){
./install-tpl.sh

# Setup build location and configure there.
rm -rf "${SRC_DIR:?}/build"
mkdir -p "${SRC_DIR}/build" || exit 1
cd "${SRC_DIR}/build" || exit 1
mkdir -p "${SRC_DIR:?}/build" || exit 1
cd "${SRC_DIR:?}/build" || exit 1
../cmake-config \
-DTPL_X11_LIBRARIES="${BUILD_PREFIX}"/lib/libX11."${BUILD_LD_EXT}" \
-DTPL_X11_INCLUDE_DIRS="${BUILD_PREFIX}"/include || return 1
-DTPL_X11_LIBRARIES="${BUILD_PREFIX:?}"/lib/libX11."${BUILD_LD_EXT:?}" \
-DTPL_X11_INCLUDE_DIRS="${BUILD_PREFIX:?}"/include || return 1

# Make and install
make -j "${JOBS:-2}" || return 1
make -j "${JOBS:?}" || return 1
make install || return 1
}

Expand Down
2 changes: 1 addition & 1 deletion conda/seacas/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MAKE SURE THAT seacas_version and seacas_git_rev match if performing a version update!
{% set build = "0" %}
{% set build = "1" %}
{% set seacas_version = "2024.08.15" %}
{% set seacas_git_rev = "v2024-08-15" %}
{% set strbuild = "build_" + build|string %}
Expand Down

0 comments on commit a82e27d

Please sign in to comment.