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.

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

Add mold 142 as build system changed from makefiles to cmake #12881

Merged
merged 31 commits into from
Oct 6, 2022
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ea1a264
add version 1.4.2
AndreyMlashkin Sep 9, 2022
2022a3c
add with_mimalloc option
AndreyMlashkin Sep 9, 2022
0bd7e4a
add validate method
AndreyMlashkin Sep 9, 2022
b9e46d7
add cmake as build requrements
AndreyMlashkin Sep 9, 2022
3841edd
use minmalloc from conan
AndreyMlashkin Sep 14, 2022
8aeaf52
use minmalloc from conan
AndreyMlashkin Sep 14, 2022
b4925e7
use tbb from conan
AndreyMlashkin Sep 14, 2022
c564934
don't use cmake as requirement for old mold
AndreyMlashkin Sep 14, 2022
473570d
hotfix
AndreyMlashkin Sep 14, 2022
805e477
add cmake_find_package generator
AndreyMlashkin Sep 14, 2022
e36a0ed
add CMakeDeps
AndreyMlashkin Sep 15, 2022
836a8f6
don't use old conans import
AndreyMlashkin Sep 15, 2022
c47338d
Update recipes/mold/1.4.x/conanfile.py
AndreyMlashkin Sep 19, 2022
6e7d6c8
package licenses
AndreyMlashkin Sep 19, 2022
05e095b
make artifacts match settings
AndreyMlashkin Sep 19, 2022
a4df1d6
correct package method for mold 1.3.1
AndreyMlashkin Sep 19, 2022
87684e3
package mold binary differently for gcc and clang
AndreyMlashkin Sep 19, 2022
3df5b3c
exclude windows builds
AndreyMlashkin Sep 19, 2022
8317db8
delete unneeded CMakeLists
AndreyMlashkin Sep 19, 2022
56c555f
Apply suggestions from code review
AndreyMlashkin Sep 20, 2022
ab58739
import VirtualBuildEnv
AndreyMlashkin Sep 21, 2022
b64d3b3
add a newline
AndreyMlashkin Sep 21, 2022
1e407af
Apply suggestions from code review
AndreyMlashkin Sep 22, 2022
0254b6e
delete package id also for 1.3.1 version
AndreyMlashkin Sep 29, 2022
fcc5aae
use build_requirements instead of requirements in test
AndreyMlashkin Sep 29, 2022
5271367
Apply suggestions from code review
AndreyMlashkin Oct 2, 2022
0b18808
Update recipes/mold/1.4.x/test_package/conanfile.py
AndreyMlashkin Oct 3, 2022
65e95ba
make mold test recipe work again
AndreyMlashkin Oct 3, 2022
e569462
add version 1.5.1
AndreyMlashkin Oct 3, 2022
ca1a600
rename folder
AndreyMlashkin Oct 4, 2022
5b3cb57
add test_v1_package
AndreyMlashkin Oct 5, 2022
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
11 changes: 4 additions & 7 deletions recipes/mold/1.4.x/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import os
AndreyMlashkin marked this conversation as resolved.
Show resolved Hide resolved
from conan import ConanFile
from conan.tools.build import cross_building
from conan.tools.layout import basic_layout
from conan.tools.build import can_run


class MoldTestConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
# VirtualRunEnv can be avoided if "tools.env.virtualenv:auto_use" is defined
# (it will be defined in Conan 2.0)
generators = "VirtualBuildEnv"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@uilianries @prince-chrismc What sould it be in the end? VirtualBuildEnv or VirtualRunEnv? I am confused

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It stopped working, as I have applied a suggestion with this change.
Why on your oppinion, it should be Run environment and not build?

generators = "VirtualRunEnv"
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing build?

test_type = "explicit"

def build_requirements(self):
self.tool_requires(self.tested_reference_str)

def test(self):
if not cross_building(self):
self.run("mold -v")
if can_run(self):
self.run("mold -v", env="conanrun")