Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update comet-ms from v2023.01.0 to v2023.01.2 #46567

Merged
merged 22 commits into from
Mar 22, 2024
Merged

Update comet-ms from v2023.01.0 to v2023.01.2 #46567

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
36ef74a
Update meta.yaml
jonasscheid Mar 19, 2024
96e450a
Update build number and run_exports
jonasscheid Mar 19, 2024
d8d31df
add -lrt to makefile due to chrono error
jonasscheid Mar 20, 2024
12e5cdc
add escapes in build.sh
jonasscheid Mar 20, 2024
b6bac71
Update build.sh
jonasscheid Mar 20, 2024
9cef25e
Update build.sh
jonasscheid Mar 20, 2024
87e0e8d
Update recipes/comet-ms/build.sh
jonasscheid Mar 20, 2024
588babd
Update build.sh
jonasscheid Mar 20, 2024
cb9ade2
Update meta.yaml
jonasscheid Mar 20, 2024
5bbd81e
Merge branch 'master' into bump-comet-version
jonasscheid Mar 20, 2024
10752f3
Update meta.yaml
jonasscheid Mar 20, 2024
a30a8c6
Update meta.yaml
jonasscheid Mar 20, 2024
f22dbef
Update meta.yaml
jonasscheid Mar 20, 2024
4afa2a1
Create conda_build_config.yaml to control glibc version during test
jonasscheid Mar 21, 2024
2ba76cd
Update meta.yaml
jonasscheid Mar 21, 2024
8ebe3af
Update meta.yaml
jonasscheid Mar 21, 2024
0eb021c
Update meta.yaml
jonasscheid Mar 21, 2024
5ace4ec
Delete recipes/comet-ms/conda_build_config.yaml
jonasscheid Mar 21, 2024
d681854
Update meta.yaml
jonasscheid Mar 21, 2024
438c430
ad gcc to build (which implicitely adds libgcc during host and runtime)
jonasscheid Mar 22, 2024
0315126
static with glibc 2.17
jpfeuffer Mar 22, 2024
f0cb87c
Merge branch 'master' into bump-comet-version
jonasscheid Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions recipes/comet-ms/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export CPPFLAGS="-I${PREFIX}/MSToolkit/include"

sed -i.bak "s#gcc#${CC}#;s#g++#${CXX}#" MSToolkit/Makefile
sed -i.bak "s#gcc#${CC}#;s#g++#${CXX}#" CometSearch/Makefile
sed -i.bak "s#\$\(LIBS\)#\$\(LIBS\) -lrt#" Makefile
Copy link
Contributor

@jpfeuffer jpfeuffer Mar 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sed -i.bak "s#\$\(LIBS\)#\$\(LIBS\) -lrt#" Makefile
sed -i.bak 's#$(LIBS)#$(LIBS) -lrt#' Makefile

Maybe try single quotes for bash?


make CXX=${CXX}

Expand Down
10 changes: 6 additions & 4 deletions recipes/comet-ms/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{% set name = "comet-ms" %}
{% set version = "2023010" %}
{% set md5 = "f1899e07eeeefddedf22b93133f9aea8" %}
{% set version = "2023012" %}
{% set md5 = "d60433652e5a5e682288ddbdfb014eb4" %}

package:
name: {{ name }}
version: {{ version }}

source:
url: https://github.com/UWPR/Comet/archive/refs/tags/v2023.01.0.zip
url: https://github.com/UWPR/Comet/archive/refs/tags/v2023.01.2.zip
md5: {{ md5 }}

build:
run_exports:
- {{ pin_subpackage('comet-ms', max_pin=None) }}
skip: True # [osx]
number: 2
number: 0

requirements:
build:
Expand Down
Loading