Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix SZIP + HDF5

  • Loading branch information...
commit 589af53ee9ebdc19e7bd79650ca030fbc2cfd211 1 parent 04ef97f
@cycle cycle authored
View
2  pkgs/science/010-szip.sh
@@ -25,7 +25,7 @@ New Mexico (UNM) and integrated with HDF4 by UNM researchers and developers. "
pkg_file="$pkg_name-$pkg_vers.tar.gz"
pkg_urls="http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src/$pkg_file"
-pkg_opts="cmake"
+pkg_opts="cmake enable-shared migrate-build-headers migrate-build-source"
pkg_uses="m4/latest autoconf/latest automake/latest"
pkg_reqs=""
pkg_cflags=""
View
4 pkgs/science/020-hdf5.sh
@@ -46,6 +46,10 @@ pkg_cfg="$pkg_cfg:-DHDF5_ENABLE_ZLIB_SUPPORT=ON"
pkg_cfg="$pkg_cfg:-DHDF5_ENABLE_SZIP_SUPPORT=ON"
pkg_cfg="$pkg_cfg:-DHDF5_BUILD_HL_LIB=ON"
pkg_cfg="$pkg_cfg:-DHDF5_DISABLE_COMPILER_WARNINGS=ON"
+pkg_cfg="$pkg_cfg:-DHDF5_DISABLE_COMPILER_WARNINGS=ON"
+pkg_cfg="$pkg_cfg -DCMAKE_CXX_FLAGS='-I$BLDR_LOCAL_DIR/science/szip/latest/include -I$BLDR_LOCAL_DIR/science/szip/latest/src'"
+pkg_cfg="$pkg_cfg -DCMAKE_CPP_FLAGS='-I$BLDR_LOCAL_DIR/science/szip/latest/include -I$BLDR_LOCAL_DIR/science/szip/latest/src'"
+pkg_cfg="$pkg_cfg -DCMAKE_C_FLAGS='-I$BLDR_LOCAL_DIR/science/szip/latest/include -I$BLDR_LOCAL_DIR/science/szip/latest/src'"
####################################################################################################
# build and install pkg as local module
View
20 system/bldr.sh
@@ -1341,7 +1341,6 @@ function bldr_cmake_pkg()
bldr_log_split
else
eval $cmake_exec $cmake_mod $cmake_pre $env_flags $cmake_src_path &>/dev/null || bldr_bail "Failed to configure: '$prefix'"
- bldr_log_split
fi
bldr_log_info "Done configuring package '$pkg_name/$pkg_vers'"
@@ -1854,6 +1853,25 @@ function bldr_migrate_pkg()
bldr_pop_dir
fi
+ if [[ $(echo $pkg_opts | grep -c 'migrate-build-source' ) > 0 ]]
+ then
+ bldr_push_dir "$BLDR_BUILD_DIR/$pkg_ctry/$pkg_name/$pkg_vers"
+ local inc_paths="src source"
+ for path in ${inc_paths}
+ do
+ # move product into external path
+ if [ -d "$path" ]
+ then
+ bldr_log_header "Migrating build files from '$path' for '$pkg_name/$pkg_vers'"
+ bldr_log_split
+ bldr_make_dir "$BLDR_LOCAL_DIR/$pkg_ctry/$pkg_name/$pkg_vers/$path"
+ bldr_copy_dir "$path" "$BLDR_LOCAL_DIR/$pkg_ctry/$pkg_name/$pkg_vers/$path" || bldr_bail "Failed to copy shared files into directory: $BLDR_LOCAL_DIR/$pkg_ctry/$pkg_name/$pkg_vers/$path"
+ bldr_log_split
+ fi
+ done
+ bldr_pop_dir
+ fi
+
if [[ $(echo $pkg_opts | grep -c 'migrate-build-libs' ) > 0 ]]
then
bldr_push_dir "$BLDR_BUILD_DIR/$pkg_ctry/$pkg_name/$pkg_vers"
Please sign in to comment.
Something went wrong with that request. Please try again.