From a09153e15db0b9c38f3e15e55ccf0da421e5b52d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 25 Sep 2024 17:15:15 -0500 Subject: [PATCH] Fix installing activation scripts --- recipe/install_activation.sh | 11 +++++++++++ recipe/meta.yaml | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/recipe/install_activation.sh b/recipe/install_activation.sh index 3b2b9a2..2bd5b79 100644 --- a/recipe/install_activation.sh +++ b/recipe/install_activation.sh @@ -33,7 +33,18 @@ CHOST="${triplet}" # echo # done +cp ${RECIPE_DIR}/scripts/* . + find . -name "*activate*.*" -exec sed -i.bak "s|@IS_WIN@|${IS_WIN}|g" "{}" \; find . -name "*activate*.*" -exec sed -i.bak "s|@TOOLS@|${TOOLS}|g" "{}" \; find . -name "*activate*.*" -exec sed -i.bak "s|@CHOST@|${CHOST}|g" "{}" \; find . -name "*activate*.*" -exec sed -i.bak "s|@LIBRARY_PREFIX@|${LIBRARY_PREFIX}|g" "{}" \; + +mkdir -p ${PREFIX}/etc/conda/{de,}activate.d +cp "${SRC_DIR}"/activate-binutils.sh ${PREFIX}/etc/conda/activate.d/activate-${PKG_NAME}.sh +cp "${SRC_DIR}"/deactivate-binutils.sh ${PREFIX}/etc/conda/deactivate.d/deactivate-${PKG_NAME}.sh + +if [[ "$target_platform" == "win-"* ]]; then + cp "${SRC_DIR}"/activate-binutils.bat ${PREFIX}/etc/conda/activate.d/activate-${PKG_NAME}.bat + cp "${SRC_DIR}"/deactivate-binutils.bat ${PREFIX}/etc/conda/deactivate.d/deactivate-${PKG_NAME}.bat +fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 158708b..4759936 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - patches/0001-fallback-sysroot.diff build: - number: 0 + number: 1 skip: true # [win64 and cross_target_platform != "win-64"] detect_binary_files_with_prefix: false @@ -98,7 +98,8 @@ outputs: - {{ pin_subpackage("binutils_impl_" ~ cross_target_platform, exact=True) }} test: commands: - - test -f $LD + - $LD --help + - $AR --help - name: binutils script: install_binutils_symlinks.sh