Skip to content

Commit

Permalink
update ucsc-bedclip adding new platform (#46626)
Browse files Browse the repository at this point in the history
* update ucsc-bedclip adding new platform

* add patch

* fix compilation for arm

* remove from blacklist

* try another way to specify compiler version

* edit pin_subpackage

---------

Co-authored-by: Joshua Zhuang <[email protected]>
  • Loading branch information
pabloaledo and mencian authored Mar 22, 2024
1 parent b0ad8e8 commit 9985819
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 4 deletions.
1 change: 0 additions & 1 deletion build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,6 @@ recipes/ucsc-axtsort
recipes/ucsc-axtswap
recipes/ucsc-axttomaf
recipes/ucsc-bamtopsl
recipes/ucsc-bedclip
recipes/ucsc-bedcommonregions
recipes/ucsc-bedcoverage
recipes/ucsc-bedextendranges
Expand Down
13 changes: 11 additions & 2 deletions recipes/ucsc-bedclip/build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
#!/bin/bash
mkdir -p "$PREFIX/bin"
export MACHTYPE=x86_64

if [ $(arch) = "aarch64" ]
then
export CFLAGS+=" -O3 -mcpu=neoverse-n1 "
export CPPFLAGS+=" -O3 -mcpu=neoverse-n1 "
else
export MACHTYPE=x86_64
fi

export BINDIR=$(pwd)/bin
export L="${LDFLAGS}"

mkdir -p "$PREFIX/bin"
mkdir -p "$BINDIR"
(cd kent/src/lib && make)
(cd kent/src/htslib && make)
Expand Down
2 changes: 2 additions & 0 deletions recipes/ucsc-bedclip/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
c_compiler_version:
- 8
9 changes: 8 additions & 1 deletion recipes/ucsc-bedclip/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ source:
sha256: "{{ sha256 }}"
patches:
- "include.patch"
- "patch1.patch"

build:
skip: True # [osx]
number: 2
number: 3
run_exports:
- {{ pin_subpackage("ucsc-bedclip", max_pin=None) }}

requirements:
build:
Expand All @@ -40,6 +43,10 @@ test:
# just check for existence, because the individual packages have no unified behavior
- which {{ program }}

extra:
additional-platforms:
- linux-aarch64

about:
home: "http://hgdownload.cse.ucsc.edu/admin/exe/"
license: "varies; see http://genome.ucsc.edu/license"
Expand Down
19 changes: 19 additions & 0 deletions recipes/ucsc-bedclip/patch1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- userApps/kent/src/lib/htmshell.c.old 2022-10-28 08:32:08.344445121 +0000
+++ userApps/kent/src/lib/htmshell.c 2022-10-28 08:32:31.708262420 +0000
@@ -711,11 +711,11 @@
puts("Status: 400\r");
puts("Content-Type: text/plain; charset=UTF-8\r");
puts("\r");
-if (format != NULL && args != NULL)
- {
- vfprintf(stdout, format, args);
- fprintf(stdout, "\n");
- }
+if (format != NULL)
+ {
+ vfprintf(stdout, format, args);
+ fprintf(stdout, "\n");
+ }
exit(-1);
}

0 comments on commit 9985819

Please sign in to comment.